Skip to content

Commit e4515e6

Browse files
committed
Remove domain from helm chart
1 parent c081251 commit e4515e6

File tree

3 files changed

+7
-7
lines changed

3 files changed

+7
-7
lines changed

helm-charts/vmpooler/templates/deployment-api.yaml

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,13 @@ spec:
4646
- 'api'
4747
livenessProbe:
4848
httpGet:
49-
path: /api/v1/status
49+
path: /api/v2/status
5050
port: {{ .Values.service.port }}
5151
initialDelaySeconds: 40
5252
periodSeconds: 10
5353
readinessProbe:
5454
httpGet:
55-
path: /api/v1/status
55+
path: /api/v2/status
5656
port: {{ .Values.service.port }}
5757
initialDelaySeconds: 40
5858
periodSeconds: 10
@@ -63,8 +63,6 @@ spec:
6363
value: {{ .Values.service.port | quote }}
6464
- name: SITE_NAME
6565
value: '<b>{{ .Values.vmpoolerInstance }}</b>.{{ .Values.ingress.domain }}'
66-
- name: DOMAIN
67-
value: {{ .Values.sut_domain }}
6866
- name: EXPERIMENTAL_FEATURES
6967
value: 'true'
7068
- name: USAGE_STATS

helm-charts/vmpooler/templates/deployment-manager.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ spec:
9393
value: '20'
9494
- name: PURGE_UNCONFIGURED_FOLDERS
9595
value: 'true'
96-
- name: DOMAIN
97-
value: {{ .Values.sut_domain }}
9896
- name: VMPOOLER_CONFIG_FILE
9997
value: /etc/vmpooler/vmpooler.yaml
10098
- name: VMPOOLER_TRACING_ENABLED

helm-charts/vmpooler/values.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ image:
88

99
jruby_opts: '-J-XX:+UseG1GC'
1010
configmapName: 'vmpooler-baseconfig'
11-
sut_domain: 'vmpooler.example.com'
1211
usage_stats: true
1312
ondemand_request_ttl: '50'
1413
ondemand_clone_limit: '50'
@@ -17,6 +16,11 @@ vm_lifetime: '2'
1716
vm_lifetime_auth: '12'
1817
timeout: '15'
1918

19+
:dns_configs:
20+
:example:
21+
dns_class: dynamic-dns
22+
domain: 'vmpooler.example.com'
23+
2024
# .json private key, set in ENV var
2125
gce:
2226
keyfile: '/vault/secrets/gce-keyfile.json'

0 commit comments

Comments
 (0)