From 82e0a265a5d5e1a7907da0ae1df71d6330b3096b Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Sat, 15 Apr 2023 02:46:32 +0000 Subject: [PATCH] fixed template --- k8s/argocd/templates/app-self.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/k8s/argocd/templates/app-self.yaml b/k8s/argocd/templates/app-self.yaml index e3b82d3..d04c1de 100644 --- a/k8s/argocd/templates/app-self.yaml +++ b/k8s/argocd/templates/app-self.yaml @@ -4,7 +4,7 @@ {{ range $path, $_ := .Files.Glob "values/shared/**.yaml" }} {{- with $currentScope }} {{ $newobj := .Files.Get $path | fromYaml }} - {{ $appvalues := merge $appvalues $newobj }} + {{ $appvalues := mergeOverwrite $appvalues $newobj }} {{- end -}} {{ end }} @@ -12,7 +12,7 @@ {{ range $path, $_ := .Files.Glob $deploymentPath }} {{- with $currentScope }} {{ $newobj := .Files.Get $path | fromYaml }} - {{ $appvalues := merge $appvalues $newobj }} + {{ $appvalues := mergeOverwrite $appvalues $newobj }} {{- end -}} {{ end }}