Merge pull request #9 from puppetlabs/update-api-deployment-templating

Fix templating in api deployment

Author: genebean

docs/index.yaml

@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T09:21:22.789199311-05:00"
+    created: "2021-12-06T11:16:09.83239609-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 10.7.12
+    description: A Helm chart to deploy vmpooler
+    digest: f279648f0afa47c5b21a56d2e04eb96e96e319a6158e73d5d55783a3b11aea12
+    icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
+    name: vmpooler
+    type: application
+    urls:
+    - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.2.tgz
+    version: 1.6.2
+  - apiVersion: v2
+    appVersion: 1.3.0
+    created: "2021-12-06T11:16:09.828159141-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-06T09:21:22.786066923-05:00"
+    created: "2021-12-06T11:16:09.823327889-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -31,4 +46,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2021-12-06T09:21:22.782791062-05:00"
+generated: "2021-12-06T11:16:09.818293623-05:00"

docs/vmpooler-1.6.2.tgz

@@ -3,7 +3,7 @@ name: vmpooler
 description: A Helm chart to deploy vmpooler
 type: application
 icon: https://github.com/puppetlabs/vmpooler/raw/master/lib/vmpooler/public/img/logo.png
-version: 1.6.1
+version: 1.6.2
 appVersion: 1.3.0
 dependencies:
   - name: redis

helm-charts/vmpooler/Chart.yaml

@@ -72,7 +72,7 @@ spec:
         - name: VMPOOLER_TRACING_JAEGER_HOST
           value: '{{ .Values.tracing.jaegerHost }}'
         - name: EXTRA_CONFIG
-          value: '/etc/vmpooler/config/pools.yaml'
+          value: '{{ .Values.additionalConfigFiles }}'
         - name: REDIS_SERVER
           value: 'redis-master'
         - name: ONDEMAND_REQUEST_TTL
@@ -104,7 +104,7 @@ spec:
               path: vmpooler.yaml
         - name: pools-config
           configMap:
-            name: vmpooler-pools
+            name: {{ .Values.poolsConfigMapName }}
             items:
             - key: pools.yaml
               path: pools.yaml