puppetlabs/vmpooler-deployment
2
0
Fork 0
mirror of https://github.com/puppetlabs/vmpooler-deployment.git synced 2026-01-26 11:38:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove domain from helm chart

Browse source
This commit is contained in:
Jake Spain 2023-02-16 10:56:52 -05:00
parent c081251826
commit e4515e6d03
No known key found for this signature in database
GPG key ID: BC1C4DA0A085E113
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
helm-charts/vmpooler/templates/deployment-api.yaml
View file

@ -46,13 +46,13 @@ spec:
- 'api' - 'api'
livenessProbe: livenessProbe:
httpGet: httpGet:
path: /api/v1/status path: /api/v2/status
port: {{ .Values.service.port }} port: {{ .Values.service.port }}
initialDelaySeconds: 40 initialDelaySeconds: 40
periodSeconds: 10 periodSeconds: 10
readinessProbe: readinessProbe:
httpGet: httpGet:
path: /api/v1/status path: /api/v2/status
port: {{ .Values.service.port }} port: {{ .Values.service.port }}
initialDelaySeconds: 40 initialDelaySeconds: 40
periodSeconds: 10 periodSeconds: 10
@ -63,8 +63,6 @@ spec:
value: {{ .Values.service.port | quote }} value: {{ .Values.service.port | quote }}
- name: SITE_NAME - name: SITE_NAME
value: '<b>{{ .Values.vmpoolerInstance }}</b>.{{ .Values.ingress.domain }}' value: '<b>{{ .Values.vmpoolerInstance }}</b>.{{ .Values.ingress.domain }}'
- name: DOMAIN
value: {{ .Values.sut_domain }}
- name: EXPERIMENTAL_FEATURES - name: EXPERIMENTAL_FEATURES
value: 'true' value: 'true'
- name: USAGE_STATS - name: USAGE_STATS

2
helm-charts/vmpooler/templates/deployment-manager.yaml
View file

@ -93,8 +93,6 @@ spec:
value: '20' value: '20'
- name: PURGE_UNCONFIGURED_FOLDERS - name: PURGE_UNCONFIGURED_FOLDERS
value: 'true' value: 'true'
- name: DOMAIN
value: {{ .Values.sut_domain }}
- name: VMPOOLER_CONFIG_FILE - name: VMPOOLER_CONFIG_FILE
value: /etc/vmpooler/vmpooler.yaml value: /etc/vmpooler/vmpooler.yaml
- name: VMPOOLER_TRACING_ENABLED - name: VMPOOLER_TRACING_ENABLED

6
helm-charts/vmpooler/values.yaml
View file

@ -8,7 +8,6 @@ image:
jruby_opts: '-J-XX:+UseG1GC' jruby_opts: '-J-XX:+UseG1GC'
configmapName: 'vmpooler-baseconfig' configmapName: 'vmpooler-baseconfig'
sut_domain: 'vmpooler.example.com'
usage_stats: true usage_stats: true
ondemand_request_ttl: '50' ondemand_request_ttl: '50'
ondemand_clone_limit: '50' ondemand_clone_limit: '50'
@ -17,6 +16,11 @@ vm_lifetime: '2'
vm_lifetime_auth: '12' vm_lifetime_auth: '12'
timeout: '15' timeout: '15'
:dns_configs:
:example:
dns_class: dynamic-dns
domain: 'vmpooler.example.com'
# .json private key, set in ENV var # .json private key, set in ENV var
gce: gce:
keyfile: '/vault/secrets/gce-keyfile.json' keyfile: '/vault/secrets/gce-keyfile.json'