BUG: kubernetes-ingress: Don't merge controller podAnnotations with crdjob podAnnotations (#293)

Signed-off-by: Dinko Korunic <[email protected]>

Author: dkorunic

kubernetes-ingress/templates/controller-crdjob.yaml

@@ -38,20 +38,13 @@ spec:
         {{- if .Values.controller.podLabels }}
 {{ toYaml .Values.controller.podLabels | indent 8 }}
         {{- end }}
-      {{- $podAnnotations := dict }}
       {{- if .Values.crdjob.podAnnotations }}
-        {{- $podAnnotations = merge $podAnnotations .Values.crdjob.podAnnotations }}
-      {{- end }}
-      {{- if .Values.controller.podAnnotations }}
-        {{- if eq "string" (printf "%T" .Values.controller.podAnnotations) }}
-          {{- $podAnnotations = merge $podAnnotations (tpl .Values.controller.podAnnotations . | fromYaml) }}
-        {{- else }}
-          {{- $podAnnotations = merge $podAnnotations .Values.controller.podAnnotations }}
-        {{- end }}
-      {{- end }}
-      {{- if not (empty $podAnnotations) }}
       annotations:
-{{ toYaml $podAnnotations | indent 8 }}
+{{- if eq "string" (printf "%T" .Values.crdjob.podAnnotations) }}
+{{ tpl .Values.crdjob.podAnnotations . | indent 8 }}
+{{- else }}
+{{ toYaml .Values.crdjob.podAnnotations | indent 8 }}
+{{- end }}
       {{- end }}
     spec:
       restartPolicy: Never

kubernetes-ingress/values.yaml

@@ -620,8 +620,6 @@ controller:
 crdjob:
   ## Additional annotations to add to the pod container metadata
   ## ref: https://kubernetes.io/docs/concepts/overview/working-with-objects/annotations/
-  ## All annotations from the controller (if set) are added to the pod metadata
-  ## If the annotation key is set for both controller and crdjob, the crdjob annotation will be used
   podAnnotations: {}
   # key: value