From 0ba4c63546a3688e57ca34f4db00123d67ccd70c Mon Sep 17 00:00:00 2001 From: Adam Eijdenberg Date: Wed, 12 Jun 2019 10:05:51 +1000 Subject: [PATCH] Update warning to be more accurate Signed-off-by: Adam Eijdenberg --- pkg/chartutil/values.go | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go index 1612b7596..890cd5540 100644 --- a/pkg/chartutil/values.go +++ b/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)