Allow custom annotations for IC pods in Helm

deployments/helm-chart/Chart.yaml

@@ -1,5 +1,5 @@
 name: nginx-ingress
-version: 0.4.0
+version: 0.5.0
 appVersion: edge
 description: NGINX Ingress Controller
 icon: https://raw.githubusercontent.com/nginxinc/kubernetes-ingress/master/deployments/helm-chart/chart-icon.png

deployments/helm-chart/README.md

@@ -104,6 +104,7 @@ Parameter | Description | Default
 `controller.reportIngressStatus.externalService` | Specifies the name of the service with the type LoadBalancer through which the Ingress controller is exposed externally. The external address of the service is used when reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. The default is autogenerated and enabled when `controller.service.create` is set to `true` and `controller.service.type` is set to `LoadBalancer`. | Autogenerated
 `controller.reportIngressStatus.enableLeaderElection` | Enable Leader election to avoid multiple replicas of the controller reporting the status of Ingress resources. `controller.reportIngressStatus.enable` must be set to `true`. | true
 `controller.reportIngressStatus.leaderElectionLockName` | Specifies the name of the ConfigMap, within the same namespace as the controller, used as the lock for leader election. controller.reportIngressStatus.enableLeaderElection must be set to true. | Autogenerated
+`controller.pod.annotations` | The annotations of the Ingress Controller pod. | {}
 `rbac.create` | Configures RBAC. | true
 `prometheus.create` | Expose NGINX or NGINX Plus metrics in the Prometheus format. | false
 `prometheus.port` | Configures the port to scrape the metrics. | 9113

deployments/helm-chart/templates/controller-daemonset.yaml

@@ -13,10 +13,15 @@ spec:
     metadata:
       labels:
         app: {{ include "nginx-ingress.name" . }}
-{{- if .Values.prometheus.create }}
+{{- if or (.Values.prometheus.create) (.Values.controller.pod.annotations) }}
       annotations:
+{{- if .Values.prometheus.create }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "{{ .Values.prometheus.port }}"
+{{- end }}
+{{- if .Values.controller.pod.annotations }}
+{{ toYaml .Values.controller.pod.annotations | indent 8 }}
+{{- end }}
 {{- end }}
     spec:
       serviceAccountName: {{ include "nginx-ingress.serviceAccountName" . }}

deployments/helm-chart/templates/controller-deployment.yaml

@@ -14,10 +14,15 @@ spec:
     metadata:
       labels:
         app: {{ include "nginx-ingress.name" . }}
-{{- if .Values.prometheus.create }}
+{{- if or (.Values.prometheus.create) (.Values.controller.pod.annotations) }}
       annotations:
+{{- if .Values.prometheus.create }}
         prometheus.io/scrape: "true"
         prometheus.io/port: "{{ .Values.prometheus.port }}"
+{{- end }}
+{{- if .Values.controller.pod.annotations }}
+{{ toYaml .Values.controller.pod.annotations | indent 8 }}
+{{- end }}
 {{- end }}
     spec:
 {{- if .Values.controller.nodeSelector }}

deployments/helm-chart/values.yaml

@@ -171,6 +171,10 @@ controller:
     ## Autogenerated if not set or set to "".
     # leaderElectionLockName: "nginx-ingress-leader-election"
 
+  pod:
+    ## The annotations of the Ingress Controller pod.
+    annotations: {}
+
 rbac:
   ## Configures RBAC.
   create: true