Apply global annotations fix

iponweb · Feb 16, 2024 · f7020ef · f7020ef
1 parent ac0cb6a
commit f7020ef
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/charts/meta-external-secrets/Chart.yaml b/charts/meta-external-secrets/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: meta-external-secrets
 description: Metachart born Helm Chart for external-secrets resources
 type: application
-version: "0.7.3"
+version: "0.7.4"
 appVersion: none
diff --git a/charts/meta-external-secrets/templates/_metachart.tpl b/charts/meta-external-secrets/templates/_metachart.tpl
@@ -168,7 +168,9 @@ Return: dict in json format
 {{- /* Execution */}}
 {{- $resourceMeta := default dict $definition.metadata }}
 {{- $checksums := (include "metachart.resourceChecksumAnnotations" (merge (dict "params" $params) $context) | fromJson) }}
-{{- $result := merge (default dict ($resourceMeta.annotations) | deepCopy) (default dict $.Values.annotations) $checksums }}
+{{- $globalAnnotations := default dict (default dict (default dict $.Values.settings).global).annotations | deepCopy }}
+{{- $resourceAnnotations := default dict $resourceMeta.annotations | deepCopy }}
+{{- $result := merge $resourceAnnotations $globalAnnotations $checksums }}
 {{- /* Return */}}
 {{- $result | toJson}}
 {{- end }}