From e4515e6d03f5803fce5aa427b6d37997f3c09ccd Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 16 Feb 2023 10:56:52 -0500
Subject: [PATCH] Remove domain from helm chart

---
 helm-charts/vmpooler/templates/deployment-api.yaml     | 6 ++----
 helm-charts/vmpooler/templates/deployment-manager.yaml | 2 --
 helm-charts/vmpooler/values.yaml                       | 6 +++++-
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/helm-charts/vmpooler/templates/deployment-api.yaml b/helm-charts/vmpooler/templates/deployment-api.yaml
index dac94a4..d3921b0 100644
--- a/helm-charts/vmpooler/templates/deployment-api.yaml
+++ b/helm-charts/vmpooler/templates/deployment-api.yaml
@@ -46,13 +46,13 @@ spec:
           - 'api'
         livenessProbe:
           httpGet:
-            path: /api/v1/status
+            path: /api/v2/status
             port: {{ .Values.service.port }}
           initialDelaySeconds: 40
           periodSeconds: 10
         readinessProbe:
           httpGet:
-            path: /api/v1/status
+            path: /api/v2/status
             port: {{ .Values.service.port }}
           initialDelaySeconds: 40
           periodSeconds: 10
@@ -63,8 +63,6 @@ spec:
           value: {{ .Values.service.port | quote  }}
         - name: SITE_NAME
           value: '<b>{{ .Values.vmpoolerInstance }}</b>.{{ .Values.ingress.domain }}'
-        - name: DOMAIN
-          value: {{ .Values.sut_domain }}
         - name: EXPERIMENTAL_FEATURES
           value: 'true'
         - name: USAGE_STATS
diff --git a/helm-charts/vmpooler/templates/deployment-manager.yaml b/helm-charts/vmpooler/templates/deployment-manager.yaml
index a39d8b0..43091b8 100644
--- a/helm-charts/vmpooler/templates/deployment-manager.yaml
+++ b/helm-charts/vmpooler/templates/deployment-manager.yaml
@@ -93,8 +93,6 @@ spec:
           value: '20'
         - name: PURGE_UNCONFIGURED_FOLDERS
           value: 'true'
-        - name: DOMAIN
-          value: {{ .Values.sut_domain }}
         - name: VMPOOLER_CONFIG_FILE
           value: /etc/vmpooler/vmpooler.yaml
         - name: VMPOOLER_TRACING_ENABLED
diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml
index 1c8460e..f7c1477 100644
--- a/helm-charts/vmpooler/values.yaml
+++ b/helm-charts/vmpooler/values.yaml
@@ -8,7 +8,6 @@ image:
 
 jruby_opts: '-J-XX:+UseG1GC'
 configmapName: 'vmpooler-baseconfig'
-sut_domain: 'vmpooler.example.com'
 usage_stats: true
 ondemand_request_ttl: '50'
 ondemand_clone_limit: '50'
@@ -17,6 +16,11 @@ vm_lifetime: '2'
 vm_lifetime_auth: '12'
 timeout: '15'
 
+:dns_configs:
+  :example:
+    dns_class: dynamic-dns
+    domain: 'vmpooler.example.com'
+
 # .json private key, set in ENV var
 gce:
   keyfile: '/vault/secrets/gce-keyfile.json'