fix(helm): DaemonSets inherit global podAnnotations

Fixes #106
enix · Apr 11, 2023 · 1a670ed · 1a670ed
1 parent cbebdde
commit 1a670ed
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/deploy/charts/x509-certificate-exporter/templates/daemonset.yaml b/deploy/charts/x509-certificate-exporter/templates/daemonset.yaml
@@ -27,9 +27,9 @@ spec:
         {{- with default $.Values.hostPathsExporter.podExtraLabels $dsDef.podExtraLabels }}
         {{- . | toYaml | trim | nindent 8 }}
         {{- end }}
-      {{- with default $.Values.hostPathsExporter.podAnnotations $dsDef.podAnnotations }}
+      {{- with mustMerge (default $.Values.hostPathsExporter.podAnnotations $dsDef.podAnnotations) $.Values.podAnnotations }}
       annotations:
-        {{- . | toYaml | trim | nindent 8 }}
+        {{- toYaml . | trim | nindent 8 }}
       {{- end }}
     spec:
       serviceAccountName: {{ include "x509-certificate-exporter.hostPathsExporterServiceAccountName" $ }}