Merge branch 'main' into multiarch-support

zapier · Nov 7, 2023 · 6c36eb8 · 6c36eb8
2 parents 8f5bde8 + 41fa4c2
commit 6c36eb8
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/charts/prom-aggregation-gateway/Chart.yaml b/charts/prom-aggregation-gateway/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v2
 name: prom-aggregation-gateway
-version: 0.6.0
+version: 0.6.1
 home: https://github.com/zapier/prom-aggregation-gateway
 maintainers:
   - name: djeebus

diff --git a/charts/prom-aggregation-gateway/templates/controller.yaml b/charts/prom-aggregation-gateway/templates/controller.yaml
@@ -20,6 +20,10 @@ spec:
   {{- end }}
   template:
     metadata:
+      {{- with .Values.podAnnotations }}
+      annotations:
+        {{- toYaml . | nindent 8 }}
+      {{- end }}
       labels:
         {{- include "prom-aggregation-gateway.selectorLabels" . | nindent 8 }}
     spec:

diff --git a/charts/prom-aggregation-gateway/values.yaml b/charts/prom-aggregation-gateway/values.yaml
@@ -21,6 +21,8 @@ podMonitor:
   create: true
   additionalLabels: {}
 
+podAnnotations: {}
+
 service:
   create: true
   annotations: {}