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 <v-fean@microsoft.com>
pull/7047/head
ferantivero 6 years ago
parent 0ca95341c1
commit 0c2221b6c9

@ -396,7 +396,7 @@ func processImportValues(c *chart.Chart) error {
if err != nil { if err != nil {
return err return err
} }
b := cvals.AsMap() b := make(map[string]interface{}, 0)
// import values from each dependency if specified in import-values // import values from each dependency if specified in import-values
for _, r := range reqs.Dependencies { for _, r := range reqs.Dependencies {
// only process raw requirement that is found in chart's dependencies (enabled) // 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 r.ImportValues = outiv
} }
} }
b = coalesceTables(b, cvals, c.Metadata.Name)
y, err := yaml.Marshal(b) y, err := yaml.Marshal(b)
if err != nil { if err != nil {
return err return err

Loading…
Cancel
Save