BUG: : kubernetes-ingress: Fix controller.podAnnotations not being te…

…mpaltable in every location Signed-off-by: Philipp Hossner <[email protected]>
haproxytech · Dec 20, 2024 · b2f4bab · b2f4bab
1 parent 133b75b
commit b2f4bab
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/kubernetes-ingress/templates/controller-crdjob.yaml b/kubernetes-ingress/templates/controller-crdjob.yaml
@@ -48,7 +48,12 @@ spec:
         {{- $podAnnotations = merge $podAnnotations .Values.crdjob.podAnnotations }}
       {{- end }}
       {{- if .Values.controller.podAnnotations }}
-        {{- $podAnnotations = merge $podAnnotations .Values.controller.podAnnotations }}
+        {{- if eq "string" (printf "%T" .Values.controller.podAnnotations) }}
+          {{- $controllerPodAnnotations := tpl .Values.controller.podAnnotations . | fromYaml }}
+          {{- $podAnnotations = merge $podAnnotations (tpl .Values.controller.podAnnotations . | fromYaml) }}
+        {{- else }}
+          {{- $podAnnotations = merge $podAnnotations .Values.controller.podAnnotations }}
+        {{- end }}
       {{- end }}
       {{- if not (empty $podAnnotations) }}
       annotations:

diff --git a/kubernetes-ingress/templates/controller-daemonset.yaml b/kubernetes-ingress/templates/controller-daemonset.yaml
@@ -53,7 +53,11 @@ spec:
         {{- end }}
       {{- if .Values.controller.podAnnotations }}
       annotations:
+{{- if eq "string" (printf "%T" .Values.controller.podAnnotations) }}
+{{ tpl .Values.controller.podAnnotations . | indent 8 }}
+{{- else }}
 {{ toYaml .Values.controller.podAnnotations | indent 8 }}
+{{- end }}
       {{- end }}
     spec:
       enableServiceLinks: {{ .Values.controller.enableServiceLinks }}

diff --git a/kubernetes-ingress/templates/controller-proxy-deployment.yaml b/kubernetes-ingress/templates/controller-proxy-deployment.yaml
@@ -52,7 +52,11 @@ spec:
         {{- end }}
       {{- if .Values.controller.podAnnotations }}
       annotations:
+{{- if eq "string" (printf "%T" .Values.controller.podAnnotations) }}
+{{ tpl .Values.controller.podAnnotations . | indent 8 }}
+{{- else }}
 {{ toYaml .Values.controller.podAnnotations | indent 8 }}
+{{- end }}
       {{- end }}
     spec:
       enableServiceLinks: {{ .Values.controller.enableServiceLinks }}