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

Merge pull request #95 from puppetlabs/configure-ondemand-ttl

Browse source 
(maint) Make additional options configurable in values file
This commit is contained in:
Jake Spain 2023-03-02 09:24:58 -05:00 • committed by GitHub
commit 38bf04c54a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -58,7 +58,7 @@ spec:
periodSeconds: 10 periodSeconds: 10
env: env:
- name: JRUBY_OPTS - name: JRUBY_OPTS
value: '-J-XX:+UseG1GC' value: '{{ .Values.jruby_opts }}'
- name: PORT - name: PORT
value: {{ .Values.service.port | quote }} value: {{ .Values.service.port | quote }}
- name: SITE_NAME - name: SITE_NAME
@ -80,15 +80,15 @@ spec:
- name: REDIS_SERVER - name: REDIS_SERVER
value: 'redis-master' value: 'redis-master'
- name: ONDEMAND_REQUEST_TTL - name: ONDEMAND_REQUEST_TTL
value: "50" value: '{{ .Values.ondemand_request_ttl }}'
- name: ONDEMAND_CLONE_LIMIT - name: ONDEMAND_CLONE_LIMIT
value: "50" value: '{{ .Values.ondemand_clone_limit }}'
- name: MAX_LIFETIME_UPPER_LIMIT - name: MAX_LIFETIME_UPPER_LIMIT
value: "336" value: '{{ .Values.max_lifetime_upper_limit }}'
- name: VM_LIFETIME - name: VM_LIFETIME
value: '2' value: '{{ .Values.vm_lifetime }}'
- name: VM_LIFETIME_AUTH - name: VM_LIFETIME_AUTH
value: '12' value: '{{ .Values.vm_lifetime_auth }}'
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

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

@ -70,15 +70,15 @@ spec:
- name: ROOT_KEYS_SCRIPT - name: ROOT_KEYS_SCRIPT
value: '{{ .Values.ec2.root_keys_script }}' value: '{{ .Values.ec2.root_keys_script }}'
- name: JRUBY_OPTS - name: JRUBY_OPTS
value: '-J-XX:+UseG1GC' value: '{{ .Values.jruby_opts }}'
- name: TASK_LIMIT - name: TASK_LIMIT
value: '30' value: '30'
- name: MIGRATION_LIMIT - name: MIGRATION_LIMIT
value: '10' value: '10'
- name: VM_LIFETIME - name: VM_LIFETIME
value: '2' value: '{{ .Values.vm_lifetime }}'
- name: VM_LIFETIME_AUTH - name: VM_LIFETIME_AUTH
value: '12' value: '{{ .Values.vm_lifetime_auth }}'
- name: VM_CHECKTIME - name: VM_CHECKTIME
value: '1' value: '1'
- name: CREATE_FOLDERS - name: CREATE_FOLDERS
@ -106,7 +106,7 @@ spec:
- name: EXTRA_CONFIG - name: EXTRA_CONFIG
value: '{{ .Values.additionalConfigFiles }}' value: '{{ .Values.additionalConfigFiles }}'
- name: TIMEOUT - name: TIMEOUT
value: '15' value: '{{ .Values.timeout }}'
- name: READY_TTL - name: READY_TTL
value: "480" value: "480"
- name: REDIS_SERVER - name: REDIS_SERVER
@ -118,9 +118,9 @@ spec:
- name: REDIS_RECONNECT_ATTEMPTS - name: REDIS_RECONNECT_ATTEMPTS
value: "40" value: "40"
- name: ONDEMAND_REQUEST_TTL - name: ONDEMAND_REQUEST_TTL
value: "50" value: '{{ .Values.ondemand_request_ttl }}'
- name: ONDEMAND_CLONE_LIMIT - name: ONDEMAND_CLONE_LIMIT
value: "50" value: '{{ .Values.ondemand_clone_limit }}'
- name: REDIS_PASSWORD - name: REDIS_PASSWORD
valueFrom: valueFrom:
secretKeyRef: secretKeyRef:

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

@ -6,9 +6,16 @@ image:
repository: ghcr.io/puppetlabs/vmpooler-deployment/vmpooler repository: ghcr.io/puppetlabs/vmpooler-deployment/vmpooler
pullPolicy: IfNotPresent pullPolicy: IfNotPresent
jruby_opts: '-J-XX:+UseG1GC'
configmapName: 'vmpooler-baseconfig' configmapName: 'vmpooler-baseconfig'
sut_domain: 'vmpooler.example.com' sut_domain: 'vmpooler.example.com'
usage_stats: true usage_stats: true
ondemand_request_ttl: '50'
ondemand_clone_limit: '50'
max_lifetime_upper_limit: '336'
vm_lifetime: '2'
vm_lifetime_auth: '12'
timeout: '15'
# .json private key, set in ENV var # .json private key, set in ENV var
gce: gce: