add tests

codefresh-io · Jan 11, 2024 · 0ab8b21 · 0ab8b21
1 parent a4ba2a8
commit 0ab8b21
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/charts/cf-common/templates/container/_container.tpl b/charts/cf-common/templates/container/_container.tpl
@@ -71,7 +71,7 @@ For backward compatibility (.Values.env takes precedence over .Values.container.
   {{- $mergedEnv = merge $.Values.env $mergedEnv }}
     {{- end }}
     {{- if $.Values.global.env }}
-  {{- $mergedEnv = mergeOverwrite $.Values.global.env $mergedEnv }}
+  {{- $mergedEnv = merge $mergedEnv $.Values.global.env }}
     {{- end }}
   env:
   {{- include "cf-common-0.17.1.env-vars" (dict "Values" $mergedEnv "context" $) | trim | nindent 2 }}