Merge pull request #23 from jyaworski/podannotations

Add pod annotation support

Author: dkorunic

kubernetes-ingress/Chart.yaml

@@ -14,7 +14,7 @@
 
 apiVersion: v1
 name: kubernetes-ingress
-version: 1.3.1
+version: 1.3.2
 kubeVersion: ">=1.12.0-0"
 description: A Helm chart for HAProxy Kubernetes Ingress Controller
 keywords:

kubernetes-ingress/templates/controller-daemonset.yaml

@@ -46,6 +46,10 @@ spec:
         {{- if .Values.controller.podLabels }}
 {{ toYaml .Values.controller.podLabels | indent 8 }}
         {{- end }}
+      {{- if .Values.controller.podAnnotations }}
+      annotations:
+{{ toYaml .Values.controller.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ template "kubernetes-ingress.serviceAccountName" . }}
       {{- if $useHostPort }}

kubernetes-ingress/templates/controller-deployment.yaml

@@ -46,6 +46,10 @@ spec:
         {{- if .Values.controller.podLabels }}
 {{ toYaml .Values.controller.podLabels | indent 8 }}
         {{- end }}
+      {{- if .Values.controller.podAnnotations }}
+      annotations:
+{{ toYaml .Values.controller.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       serviceAccountName: {{ template "kubernetes-ingress.serviceAccountName" . }}
 {{- if .Values.controller.imageCredentials.registry }}

kubernetes-ingress/templates/default-backend-deployment.yaml

@@ -41,6 +41,10 @@ spec:
         {{- if .Values.defaultBackend.podLabels }}
 {{ toYaml .Values.defaultBackend.podLabels | indent 8 }}
         {{- end }}
+      {{- if .Values.defaultBackend.podAnnotations }}
+      annotations:
+{{ toYaml .Values.defaultBackend.podAnnotations | indent 8 }}
+      {{- end }}
     spec:
       containers:
         - name: {{ template "kubernetes-ingress.name" . }}-{{ .Values.defaultBackend.name }}

kubernetes-ingress/values.yaml

@@ -113,6 +113,11 @@ controller:
   podLabels: {}
   #  key: value
 
+  ## Additional annotations to add to the pod container metadata
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  podAnnotations: {}
+  #  key: value
+
   ## Ingress TLS secret, if enabled is true and secret is null then controller will use auto-generated secret otherwise provided secret is used
   ## ref: https://kubernetes.io/docs/concepts/services-networking/ingress/#tls
   defaultTLSSecret:
@@ -326,6 +331,11 @@ defaultBackend:
   podLabels: {}
   #  key: value
 
+  ## Additional annotations to add to the pod container metadata
+  ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
+  podAnnotations: {}
+  #  key: value
+
   service:
     ## Service ports
     ## ref: https://kubernetes.io/docs/concepts/services-networking/service/