mirror of
https://github.com/puppetlabs/vmpooler-deployment.git
synced 2026-01-26 03:28:41 -05:00
Remove domain from helm chart
This commit is contained in:
parent
c081251826
commit
e4515e6d03
3 changed files with 7 additions and 7 deletions
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue