(DIO-3229) Add non sensitive parameters as ENV vars, and expect the secrets to be passed as provider config

remove the change to support an override of the command as the entrypoint is needed

docs/index.yaml

@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-07T11:20:20.126008-05:00"
+    created: "2022-07-08T09:02:28.097273-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 16.10.1
+    description: A Helm chart to deploy vmpooler
+    digest: 586eed077d8a3fbc58c2dd3ca3c5e2315d367204d462d9203a9a8e3cbd4674bc
+    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.16.0.tgz
+    version: 1.16.0
+  - apiVersion: v2
+    appVersion: 1.6.0-prod-all-providers
+    created: "2022-07-08T09:02:28.091384-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.15.0
   - apiVersion: v2
     appVersion: 1.6.0-prod-all-providers
-    created: "2022-07-07T11:20:20.121125-05:00"
+    created: "2022-07-08T09:02:28.085533-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.14.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-07T11:20:20.113811-05:00"
+    created: "2022-07-08T09:02:28.079135-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.13.0
   - apiVersion: v2
     appVersion: 1.5.0-prod-all-providers
-    created: "2022-07-07T11:20:20.10659-05:00"
+    created: "2022-07-08T09:02:28.073016-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.12.0
   - apiVersion: v2
     appVersion: 1.4.0-prod-all-providers
-    created: "2022-07-07T11:20:20.101641-05:00"
+    created: "2022-07-08T09:02:28.068619-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.11.1
   - apiVersion: v2
     appVersion: 1.3.0-prod-all-providers
-    created: "2022-07-07T11:20:20.095716-05:00"
+    created: "2022-07-08T09:02:28.064391-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.11.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-07T11:20:20.090787-05:00"
+    created: "2022-07-08T09:02:28.058908-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.10.1
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-07T11:20:20.084207-05:00"
+    created: "2022-07-08T09:02:28.05419-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-07T11:20:20.158097-05:00"
+    created: "2022-07-08T09:02:28.125234-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -138,7 +153,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-07-07T11:20:20.154432-05:00"
+    created: "2022-07-08T09:02:28.122042-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -153,7 +168,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-07T11:20:20.150058-05:00"
+    created: "2022-07-08T09:02:28.117441-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -168,7 +183,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-07-07T11:20:20.146176-05:00"
+    created: "2022-07-08T09:02:28.114555-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -183,7 +198,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-07T11:20:20.142318-05:00"
+    created: "2022-07-08T09:02:28.111222-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -198,7 +213,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-07T11:20:20.13796-05:00"
+    created: "2022-07-08T09:02:28.108084-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -213,7 +228,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-07T11:20:20.134247-05:00"
+    created: "2022-07-08T09:02:28.103964-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -228,7 +243,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-07-07T11:20:20.13096-05:00"
+    created: "2022-07-08T09:02:28.100758-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -241,4 +256,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-07-07T11:20:20.077824-05:00"
+generated: "2022-07-08T09:02:28.04791-05:00"

helm-charts/vmpooler/Chart.yaml

@@ -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.15.0
+version: 1.16.0
 appVersion: 1.6.0-prod-all-providers
 dependencies:
   - name: redis

helm-charts/vmpooler/templates/deployment-api.yaml

@@ -42,12 +42,6 @@ spec:
           - containerPort: {{ .Values.service.port }}
         resources:
           {{- toYaml .Values.api.resources | nindent 12 }}
-        {{- if .Values.overrideCmd -}}
-        {{- with .Values.overrideCmd }}
-        command:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- end }}
         args:
           - 'api'
         livenessProbe:

helm-charts/vmpooler/templates/deployment-manager.yaml

@@ -44,12 +44,6 @@ spec:
         - containerPort: {{ .Values.service.port }}
         resources:
           {{- toYaml .Values.manager.resources | nindent 12 }}
-        {{- if .Values.overrideCmd -}}
-        {{- with .Values.overrideCmd }}
-        command:
-          {{- toYaml . | nindent 10 }}
-        {{- end }}
-        {{- end }}
         args:
           - 'manager'
         livenessProbe:
@@ -71,6 +65,8 @@ spec:
         env:
         - name: GOOGLE_APPLICATION_CREDENTIALS
           value: '{{ .Values.gce.keyfile }}'
+        - name: AWS_KEY_FILE_LOCATION
+          value: '{{ .Values.ec2.keyfile }}'
         - name: JRUBY_OPTS
           value: '-J-XX:+UseG1GC -Xinvokedynamic.yield=false'
         - name: TASK_LIMIT

helm-charts/vmpooler/values.yaml

@@ -14,6 +14,9 @@ usage_stats: true
 gce:
   keyfile: '/vault/secrets/gce-keyfile.json'
 
+ec2:
+  keyfile: '/vault/secrets/ec2-keyfile.rsa'
+
 tracing:
   enabled: 'false'
   # jaegerHost: 'http://otel-collector.otel-collector.svc:14268/api/traces'
@@ -44,10 +47,6 @@ auth:
 
 additionalConfigFiles: '/etc/vmpooler/config/pools.yaml'
 
-# This overrides the deployment's spec.container.command (defaults to the Dockerfile entrypoint)
-# overrideCmd:
-#   - 'source foo && docker-entrypoint.sh'
-
 api:
   replicaCount: 1
   resources: