Merge pull request #33 from puppetlabs/fix-annotations

fix annotations
puppetlabs · Mar 30, 2022 · 943f784 · 943f784
2 parents 0586954 + 4dc464b
commit 943f784
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 14 deletions.
diff --git a/docs/index.yaml b/docs/index.yaml
@@ -3,7 +3,22 @@ entries:
   vmpooler:
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-03-30T13:45:09.325403-05:00"
+    created: "2022-03-30T16:15:32.197788-05:00"
+    dependencies:
+    - name: redis
+      repository: https://charts.bitnami.com/bitnami
+      version: 13.0.1
+    description: A Helm chart to deploy vmpooler
+    digest: 8e6ffbda02c93ab1b34d2caa0cfda20796e9754688007f487e084af1c669d20a
+    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.10.1.tgz
+    version: 1.10.1
+  - apiVersion: v2
+    appVersion: 1.2.0-prod-all-providers
+    created: "2022-03-30T16:15:32.192746-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -18,7 +33,7 @@ entries:
     version: 1.10.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-03-30T13:45:09.362397-05:00"
+    created: "2022-03-30T16:15:32.234053-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -33,7 +48,7 @@ entries:
     version: 1.9.0
   - apiVersion: v2
     appVersion: 1.2.0-prod-all-providers
-    created: "2022-03-30T13:45:09.357526-05:00"
+    created: "2022-03-30T16:15:32.230069-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -48,7 +63,7 @@ entries:
     version: 1.8.0
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-03-30T13:45:09.353298-05:00"
+    created: "2022-03-30T16:15:32.225402-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -63,7 +78,7 @@ entries:
     version: 1.7.1
   - apiVersion: v2
     appVersion: 1.0.0-prod-all-providers
-    created: "2022-03-30T13:45:09.348707-05:00"
+    created: "2022-03-30T16:15:32.221567-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -78,7 +93,7 @@ entries:
     version: 1.7.0
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-03-30T13:45:09.344263-05:00"
+    created: "2022-03-30T16:15:32.216875-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -93,7 +108,7 @@ entries:
     version: 1.6.3
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-03-30T13:45:09.339826-05:00"
+    created: "2022-03-30T16:15:32.212622-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -108,7 +123,7 @@ entries:
     version: 1.6.2
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-03-30T13:45:09.335088-05:00"
+    created: "2022-03-30T16:15:32.208154-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -123,7 +138,7 @@ entries:
     version: 1.6.1
   - apiVersion: v2
     appVersion: 1.3.0
-    created: "2022-03-30T13:45:09.331129-05:00"
+    created: "2022-03-30T16:15:32.203964-05:00"
     dependencies:
     - name: redis
       repository: https://charts.bitnami.com/bitnami
@@ -136,4 +151,4 @@ entries:
     urls:
     - https://puppetlabs.github.io/vmpooler-deployment/vmpooler-1.6.0.tgz
     version: 1.6.0
-generated: "2022-03-30T13:45:09.3191-05:00"
+generated: "2022-03-30T16:15:32.185316-05:00"
diff --git a/docs/vmpooler-1.10.1.tgz b/docs/vmpooler-1.10.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.10.0
+version: 1.10.1
 appVersion: 1.2.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
@@ -11,9 +11,6 @@ metadata:
   annotations:
     configmap.reloader.stakater.com/reload: "{{ .Values.configmapName }},vmpooler-pools"
     secret.reloader.stakater.com/reload: 'redis'
-    {{- with .Values.api.annotations }}
-    {{- toYaml . | nindent 8 }}
-    {{- end }}
 spec:
   replicas: {{ .Values.api.replicaCount }}
   selector:
@@ -23,6 +20,10 @@ spec:
     metadata:
       labels:
         app: {{ $fullName }}-api
+  {{- with .Values.api.annotations }}
+      annotations:
+    {{- toYaml . | nindent 8 }}
+  {{- end }}
     spec:
     {{- with .Values.imagePullSecrets }}
       imagePullSecrets: