diff --git a/pkg/chartutil/requirements.go b/pkg/chartutil/requirements.go
index f21a22005c1ac280ac9e03afa53dc6f5f8e135be..ac2649d7cb7fd4c1532d661dcba2e4cd9ebdf52e 100644
--- a/pkg/chartutil/requirements.go
+++ b/pkg/chartutil/requirements.go
@@ -391,7 +391,7 @@ func processImportValues(c *chart.Chart) error {
if err != nil {
return err
}
- b := make(map[string]interface{}, 0)
+ b := cvals.AsMap()
// 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)
@@ -428,7 +428,7 @@ func processImportValues(c *chart.Chart) error {
}
// create value map from child to be merged into parent
vm := pathToMap(nm["parent"], vv.AsMap())
- b = coalesceTables(cvals, vm, c.Metadata.Name)
+ b = coalesceTables(b, vm, c.Metadata.Name)
case string:
nm := map[string]string{
"child": "exports." + iv,
@@ -448,7 +448,6 @@ 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
diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index 6270531d77d88b0b24fd64c2030183bd8334b09e..1612b75964fbb3dc9580d8436c988b4d0788b819 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -172,9 +172,7 @@ func CoalesceValues(chrt *chart.Chart, vals *chart.Config) (Values, error) {
}
}
- var err error
- cvals, err = coalesceDeps(chrt, cvals)
- return cvals, err
+ return coalesceDeps(chrt, cvals)
}
// coalesce coalesces the dest values and the chart values, giving priority to the dest values.
@@ -186,8 +184,7 @@ func coalesce(ch *chart.Chart, dest map[string]interface{}) (map[string]interfac
if err != nil {
return dest, err
}
- coalesceDeps(ch, dest)
- return dest, nil
+ return coalesceDeps(ch, dest)
}
// coalesceDeps coalesces the dependencies of the given chart.
@@ -203,7 +200,7 @@ func coalesceDeps(chrt *chart.Chart, dest map[string]interface{}) (map[string]in
dvmap := dv.(map[string]interface{})
// Get globals out of dest and merge them into dvmap.
- coalesceGlobals(dvmap, dest, chrt.Metadata.Name)
+ dvmap = coalesceGlobals(dvmap, dest, chrt.Metadata.Name)
var err error
// Now coalesce the rest of the values.
@@ -236,45 +233,20 @@ func coalesceGlobals(dest, src map[string]interface{}, chartName string) map[str
return dg
}
+ rv := make(map[string]interface{})
+ for k, v := range dest {
+ rv[k] = v
+ }
+
// EXPERIMENTAL: In the past, we have disallowed globals to test tables. This
// reverses that decision. It may somehow be possible to introduce a loop
// here, but I haven't found a way. So for the time being, let's allow
// tables in globals.
- for key, val := range sg {
- if istable(val) {
- vv := copyMap(val.(map[string]interface{}))
- if destv, ok := dg[key]; ok {
- if destvmap, ok := destv.(map[string]interface{}); ok {
- // Basically, we reverse order of coalesce here to merge
- // top-down.
- coalesceTables(vv, destvmap, chartName)
- dg[key] = vv
- continue
- } else {
- log.Printf("Warning: For chart '%s', cannot merge map onto non-map for key '%q'. Skipping.", chartName, key)
- }
- } else {
- // Here there is no merge. We're just adding.
- dg[key] = vv
- }
- } else if dv, ok := dg[key]; ok && istable(dv) {
- // It's not clear if this condition can actually ever trigger.
- log.Printf("Warning: For chart '%s', key '%s' is a table. Skipping.", chartName, key)
- continue
- }
- // TODO: Do we need to do any additional checking on the value?
- dg[key] = val
- }
- dest[GlobalKey] = dg
- return dest
-}
-func copyMap(src map[string]interface{}) map[string]interface{} {
- dest := make(map[string]interface{}, len(src))
- for k, v := range src {
- dest[k] = v
- }
- return dest
+ // Basically, we reverse order of coalesce here to merge
+ // top-down.
+ rv[GlobalKey] = coalesceTables(sg, dg, chartName)
+ return rv
}
// coalesceValues builds up a values map for a particular chart.
@@ -294,30 +266,7 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interf
return v, fmt.Errorf("Error: Reading chart '%s' default values (%s): %s", c.Metadata.Name, c.Values.Raw, err)
}
- for key, val := range nv {
- if value, ok := v[key]; ok {
- if value == nil {
- // When the YAML value is null, we remove the value's key.
- // This allows Helm's various sources of values (value files or --set) to
- // remove incompatible keys from any previous chart, file, or set values.
- delete(v, key)
- } else if dest, ok := value.(map[string]interface{}); ok {
- // if v[key] is a table, merge nv's val table into v[key].
- src, ok := val.(map[string]interface{})
- if !ok {
- log.Printf("Warning: Building values map for chart '%s'. Skipped value (%+v) for '%s', as it is not a table.", c.Metadata.Name, src, key)
- continue
- }
- // Because v has higher precedence than nv, dest values override src
- // values.
- coalesceTables(dest, src, c.Metadata.Name)
- }
- } else {
- // If the key is not in v, copy it from nv.
- v[key] = val
- }
- }
- return v, nil
+ return coalesceTables(v, nv.AsMap(), c.Metadata.Name), nil
}
// coalesceTables merges a source map into a destination map.
@@ -326,36 +275,50 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interf
func coalesceTables(dst, src map[string]interface{}, chartName string) map[string]interface{} {
// Because dest has higher precedence than src, dest values override src
// values.
+
+ rv := make(map[string]interface{})
for key, val := range src {
dv, ok := dst[key]
- if ok && dv == nil {
- // skip here, we delete at end
+ if !ok { // if not in dst, then copy from src
+ rv[key] = val
continue
}
- if istable(val) {
- if !ok {
- dst[key] = val
- } else if istable(dv) {
- coalesceTables(dv.(map[string]interface{}), val.(map[string]interface{}), chartName)
- } else {
- log.Printf("Warning: Merging destination map for chart '%s'. Cannot overwrite table item '%s', with non table value: %v", chartName, key, val)
- }
+ if dv == nil { // if set to nil in dst, then ignore
+ // When the YAML value is null, we skip the value's key.
+ // This allows Helm's various sources of values (value files or --set) to
+ // remove incompatible keys from any previous chart, file, or set values.
continue
- } else if ok && istable(dv) {
+ }
+
+ srcTable, srcIsTable := val.(map[string]interface{})
+ dstTable, dstIsTable := dv.(map[string]interface{})
+ switch {
+ case srcIsTable && dstIsTable: // both tables, we coalesce
+ rv[key] = coalesceTables(dstTable, srcTable, chartName)
+ case srcIsTable && !dstIsTable:
+ log.Printf("Warning: Merging destination map for chart '%s'. Cannot overwrite table item '%s', with non table value: %v", chartName, key, val)
+ // despite message in warning, we appear to do exactly that, and do take the dst value
+ rv[key] = dv
+ case !srcIsTable && dstIsTable:
log.Printf("Warning: Merging destination map for chart '%s'. The destination item '%s' is a table and ignoring the source '%s' as it has a non-table value of: %v", chartName, key, key, val)
- continue
- } else if !ok { // <- ok is still in scope from preceding conditional.
- dst[key] = val
- continue
+ rv[key] = dv
+ default: // neither are tables, simply take the dst value
+ rv[key] = dv
}
}
- // never return a nil value, rather delete the key
- for k, v := range dst {
- if v == nil {
- delete(dst, k)
+
+ // do we have anything in dst that wasn't processed already that we need to copy across?
+ for key, val := range dst {
+ if val == nil {
+ continue
+ }
+ _, ok := rv[key]
+ if !ok {
+ rv[key] = val
}
}
- return dst
+
+ return rv
}
// ReleaseOptions represents the additional release options needed