Skip to content
Permalink
Browse files

Update warning to be more accurate

Signed-off-by: Adam Eijdenberg <adam.eijdenberg@digital.gov.au>
  • Loading branch information...
aeijdenberg committed Jun 12, 2019
1 parent dda8497 commit 0ba4c63546a3688e57ca34f4db00123d67ccd70c
Showing with 1 addition and 2 deletions.
  1. +1 −2 pkg/chartutil/values.go
@@ -296,8 +296,7 @@ func coalesceTables(dst, src map[string]interface{}, chartName string) map[strin
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
log.Printf("Warning: Merging destination map for chart '%s'. Overwriting table item '%s', with non table value: %v", chartName, key, dv)
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)

0 comments on commit 0ba4c63

Please sign in to comment.
You can’t perform that action at this time.