Merge pull request #61 from tnadalie/feat/handle-custom-annotations

Helm: handle custom controller annotations
zapier · Mar 15, 2023 · cec2ed9 · cec2ed9
2 parents dac12d6 + 355dfe9
commit cec2ed9
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 2 deletions.
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.5.1
+version: 0.5.2
 home: https://github.com/zapier/prom-aggregation-gateway
 maintainers:
   - name: djeebus

diff --git a/charts/prom-aggregation-gateway/templates/_helpers.tpl b/charts/prom-aggregation-gateway/templates/_helpers.tpl
@@ -18,6 +18,10 @@ app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 app.kubernetes.io/managed-by: {{ .Release.Service }}
 {{- end }}
 
+{{- define "prom-aggregation-gateway.annotations" -}}
+{{ toYaml .Values.controller.annotations }}
+{{- end }}
+
 {{- define "prom-aggregation-gateway.selectorLabels" -}}
 app.kubernetes.io/name: {{ include "prom-aggregation-gateway.name" . }}
 app.kubernetes.io/instance: {{ .Release.Name }}

diff --git a/charts/prom-aggregation-gateway/templates/controller.yaml b/charts/prom-aggregation-gateway/templates/controller.yaml
@@ -7,7 +7,10 @@ metadata:
     {{- if .Values.controller.labels }}
     {{- toYaml .Values.controller.labels | nindent 4 }}
     {{- end }}
-
+  {{- if .Values.controller.annotations }}
+    annotations:
+      {{- include "prom-aggregation-gateway.annotations" . | nindent 4 }}
+  {{- end }}
 spec:
   selector:
     matchLabels:

diff --git a/charts/prom-aggregation-gateway/values.schema.json b/charts/prom-aggregation-gateway/values.schema.json
@@ -42,6 +42,12 @@
         },
         "apiPort": {
           "type": "integer"
+        },
+        "annotations": {
+          "type": "object",
+          "patternProperties": {
+            ".*": {"type":  "string"}
+          }
         }
       },
       "required": [