Merge pull request #20 from puppetlabs/vmpooler-helm-image-tag-fix

Update vmpooler chart to accept image tag override
puppetlabs · Dec 13, 2021 · 4d15af4 · 4d15af4
2 parents 2977012 + 79bb824
commit 4d15af4
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 9 deletions.
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2021-12-09T11:59:49.029819707-05:00"
+    created: "2021-12-13T12:57:32.31814774-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 10.7.12
+    description: A Helm chart to deploy vmpooler
+    digest: cc06f56e3cd6d2135c6d15da83b750a445e4856e2b366af0a1713be47eccedb4
+    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.7.1.tgz
+    version: 1.7.1
+  - apiVersion: v2
+    appVersion: 1.0.0-prod-all-providers
+    created: "2021-12-13T12:57:32.315394959-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-09T11:59:49.022301197-05:00"
+    created: "2021-12-13T12:57:32.312208652-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-09T11:59:49.009848522-05:00"
+    created: "2021-12-13T12:57:32.308927559-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-09T11:59:49.001801711-05:00"
+    created: "2021-12-13T12:57:32.306210785-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2021-12-09T11:59:48.99054428-05:00"
+    created: "2021-12-13T12:57:32.302874489-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -76,4 +91,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2021-12-09T11:59:48.97218007-05:00"
+generated: "2021-12-13T12:57:32.298620936-05:00"
diff --git a/docs/vmpooler-1.7.1.tgz b/docs/vmpooler-1.7.1.tgz
diff --git a/helm-charts/vmpooler/Chart.yaml b/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.7.0
+version: 1.7.1
 appVersion: 1.0.0-prod-all-providers
 dependencies:
   - name: redis

diff --git a/helm-charts/vmpooler/templates/deployment-api.yaml b/helm-charts/vmpooler/templates/deployment-api.yaml
@@ -32,7 +32,7 @@ spec:
       - name: {{ $fullName }}-api
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+        image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
           - containerPort: {{ .Values.service.port }}

diff --git a/helm-charts/vmpooler/templates/deployment-manager.yaml b/helm-charts/vmpooler/templates/deployment-manager.yaml
@@ -38,7 +38,7 @@ spec:
       - name: {{ $fullName }}-manager
         securityContext:
           {{- toYaml .Values.securityContext | nindent 12 }}
-        image: "{{ .Values.image.repository }}:{{ .Chart.AppVersion }}"
+        image: "{{ .Values.image.repository }}:{{ default .Chart.AppVersion .Values.image.tag }}"
         imagePullPolicy: {{ .Values.image.pullPolicy }}
         ports:
         - containerPort: {{ .Values.service.port }}