From 4fafe2fe114ea25331e2836a6c146f04286c38e9 Mon Sep 17 00:00:00 2001 From: Bernd Gutjahr Date: Thu, 24 Sep 2020 12:53:24 +0200 Subject: [PATCH] fix: prevent global values from subcharts to affect parent and sibling charts Signed-off-by: Bernd Gutjahr --- pkg/chartutil/coalesce.go | 1 + 1 file changed, 1 insertion(+) diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go index e086d8b6e..50a889205 100644 --- a/pkg/chartutil/coalesce.go +++ b/pkg/chartutil/coalesce.go @@ -112,6 +112,7 @@ func coalesceGlobals(dest, src map[string]interface{}) { if destv, ok := dg[key]; !ok { // Here there is no merge. We're just adding. dg[key] = vv + continue } else { if destvmap, ok := destv.(map[string]interface{}); !ok { log.Printf("Conflict: cannot merge map onto non-map for %q. Skipping.", key)