From 0c2221b6c938459df4fef93dfeed4d649a1a4f45 Mon Sep 17 00:00:00 2001 From: ferantivero Date: Fri, 22 Nov 2019 17:08:40 -0700 Subject: [PATCH] partially revert refactor for table coalescing go back the empty initialization of map values, otherwise parent chart values wins when calescing. Signed-off-by: ferantivero --- pkg/chartutil/requirements.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/chartutil/requirements.go b/pkg/chartutil/requirements.go index 4c9713233..fb2fe3b5a 100644 --- a/pkg/chartutil/requirements.go +++ b/pkg/chartutil/requirements.go @@ -396,7 +396,7 @@ func processImportValues(c *chart.Chart) error { if err != nil { return err } - b := cvals.AsMap() + b := make(map[string]interface{}, 0) // import values from each dependency if specified in import-values for _, r := range reqs.Dependencies { // only process raw requirement that is found in chart's dependencies (enabled) @@ -453,6 +453,7 @@ func processImportValues(c *chart.Chart) error { r.ImportValues = outiv } } + b = coalesceTables(b, cvals, c.Metadata.Name) y, err := yaml.Marshal(b) if err != nil { return err