Deployment: Implement controller.podAnnotations.

giantswarm · Mar 14, 2023 · a642409 · a642409
1 parent 3ad420a
commit a642409
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -27,6 +27,7 @@ and this project's packages adheres to [Semantic Versioning](http://semver.org/s
   - Deployment: Implement `controller.labels`.
   - Deployment: Implement `controller.annotations`.
   - Deployment: Implement `revisionHistoryLimit`.
+  - Deployment: Implement `controller.podAnnotations`.
 
 ### Changed
 

diff --git a/helm/nginx-ingress-controller-app/templates/controller-deployment.yaml b/helm/nginx-ingress-controller-app/templates/controller-deployment.yaml
@@ -37,14 +37,19 @@ spec:
   minReadySeconds: {{ .Values.controller.minReadySeconds }}
   template:
     metadata:
-      labels:
-        {{- include "ingress-nginx.labels" . | nindent 8 }}
-        app.kubernetes.io/component: controller
       annotations:
         cluster-autoscaler.kubernetes.io/safe-to-evict: 'true'
-        {{- range .Values.controller.extraAnnotations.pod }}
+      {{- range .Values.controller.extraAnnotations.pod }}
         {{ . }}
-        {{- end }}
+      {{- end }}
+    {{- if .Values.controller.podAnnotations }}
+      {{- range $key, $value := .Values.controller.podAnnotations }}
+        {{ $key }}: {{ $value | quote }}
+      {{- end }}
+    {{- end }}
+      labels:
+        {{- include "ingress-nginx.labels" . | nindent 8 }}
+        app.kubernetes.io/component: controller
     spec:
       affinity:
         {{- with .Values.controller.nodeAffinity }}

diff --git a/helm/nginx-ingress-controller-app/values.schema.json b/helm/nginx-ingress-controller-app/values.schema.json
@@ -609,6 +609,9 @@
                 "nodeAffinity": {
                     "type": ["object", "null"]
                 },
+                "podAnnotations": {
+                    "type": "object"
+                },
                 "proxySetHeaders": {
                     "type": "object"
                 },

diff --git a/helm/nginx-ingress-controller-app/values.yaml b/helm/nginx-ingress-controller-app/values.yaml
@@ -293,6 +293,10 @@ controller:
       #     description: Too many 4XXs
       #     summary: More than 5% of all requests returned 4XX, this requires your attention
 
+  # -- Annotations to be added to controller pods
+  ##
+  podAnnotations: {}
+
   # controller.resources
   resources: