From 07fef6275eb7d62a4dc21cf391a17be6a8f9940a Mon Sep 17 00:00:00 2001
From: Jake Spain <jake.spain+15749776@perforce.com>
Date: Thu, 2 Mar 2023 08:50:11 -0500
Subject: [PATCH] Make additional options configurable in values file

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

diff --git a/helm-charts/vmpooler/templates/deployment-api.yaml b/helm-charts/vmpooler/templates/deployment-api.yaml
index 3afa904..dac94a4 100644
--- a/helm-charts/vmpooler/templates/deployment-api.yaml
+++ b/helm-charts/vmpooler/templates/deployment-api.yaml
@@ -58,7 +58,7 @@ spec:
           periodSeconds: 10
         env:
         - name: JRUBY_OPTS
-          value: '-J-XX:+UseG1GC'
+          value: '{{ .Values.jruby_opts }}'
         - name: PORT
           value: {{ .Values.service.port | quote  }}
         - name: SITE_NAME
@@ -80,15 +80,15 @@ spec:
         - name: REDIS_SERVER
           value: 'redis-master'
         - name: ONDEMAND_REQUEST_TTL
-          value: "50"
+          value: '{{ .Values.ondemand_request_ttl }}'
         - name: ONDEMAND_CLONE_LIMIT
-          value: "50"
+          value: '{{ .Values.ondemand_clone_limit }}'
         - name: MAX_LIFETIME_UPPER_LIMIT
-          value: "336"
+          value: '{{ .Values.max_lifetime_upper_limit }}'
         - name: VM_LIFETIME
-          value: '2'
+          value: '{{ .Values.vm_lifetime }}'
         - name: VM_LIFETIME_AUTH
-          value: '12'
+          value: '{{ .Values.vm_lifetime_auth }}'
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
diff --git a/helm-charts/vmpooler/templates/deployment-manager.yaml b/helm-charts/vmpooler/templates/deployment-manager.yaml
index 5d475c2..a39d8b0 100644
--- a/helm-charts/vmpooler/templates/deployment-manager.yaml
+++ b/helm-charts/vmpooler/templates/deployment-manager.yaml
@@ -70,15 +70,15 @@ spec:
         - name: ROOT_KEYS_SCRIPT
           value: '{{ .Values.ec2.root_keys_script }}'
         - name: JRUBY_OPTS
-          value: '-J-XX:+UseG1GC'
+          value: '{{ .Values.jruby_opts }}'
         - name: TASK_LIMIT
           value: '30'
         - name: MIGRATION_LIMIT
           value: '10'
         - name: VM_LIFETIME
-          value: '2'
+          value: '{{ .Values.vm_lifetime }}'
         - name: VM_LIFETIME_AUTH
-          value: '12'
+          value: '{{ .Values.vm_lifetime_auth }}'
         - name: VM_CHECKTIME
           value: '1'
         - name: CREATE_FOLDERS
@@ -106,7 +106,7 @@ spec:
         - name: EXTRA_CONFIG
           value: '{{ .Values.additionalConfigFiles }}'
         - name: TIMEOUT
-          value: '15'
+          value: '{{ .Values.timeout }}'
         - name: READY_TTL
           value: "480"
         - name: REDIS_SERVER
@@ -118,9 +118,9 @@ spec:
         - name: REDIS_RECONNECT_ATTEMPTS
           value: "40"
         - name: ONDEMAND_REQUEST_TTL
-          value: "50"
+          value: '{{ .Values.ondemand_request_ttl }}'
         - name: ONDEMAND_CLONE_LIMIT
-          value: "50"
+          value: '{{ .Values.ondemand_clone_limit }}'
         - name: REDIS_PASSWORD
           valueFrom:
             secretKeyRef:
diff --git a/helm-charts/vmpooler/values.yaml b/helm-charts/vmpooler/values.yaml
index 419fad5..1c8460e 100644
--- a/helm-charts/vmpooler/values.yaml
+++ b/helm-charts/vmpooler/values.yaml
@@ -6,9 +6,16 @@ image:
   repository: ghcr.io/puppetlabs/vmpooler-deployment/vmpooler
   pullPolicy: IfNotPresent
 
+jruby_opts: '-J-XX:+UseG1GC'
 configmapName: 'vmpooler-baseconfig'
 sut_domain: 'vmpooler.example.com'
 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
 gce: