Merge 34807fc4f8 into 53dfa521e0

pkg/chart/common/util/coalesce.go

@@ -245,7 +245,7 @@ func coalesceValues(printf printFn, c chart.Charter, v map[string]any, prefix st
 					// If the original value is nil, there is nothing to coalesce, so we don't print
 					// the warning
 					if val != nil {
-						printf("warning: skipped value for %s.%s: Not a table.", subPrefix, key)
+						printf("warning: skipped value for %s.%s: the chart default here is a table (a nested map of keys), but the supplied value is not, so it was ignored.", subPrefix, key)
 					}
 				} else {
 					// If the key is a child chart, coalesce tables with Merge set to true
@@ -349,10 +349,10 @@ func coalesceTablesFullKey(printf printFn, dst, src map[string]any, prefix strin
 			if istable(dv) {
 				coalesceTablesFullKey(printf, dv.(map[string]any), val.(map[string]any), fullkey, merge)
 			} else {
-				printf("warning: cannot overwrite table with non table for %s (%v)", fullkey, val)
+				printf("warning: cannot overwrite table with non table for %s (%v): the destination is a table (a nested map of keys) but the source value is not, so the source value was ignored.", fullkey, val)
 			}
 		case istable(dv) && val != nil:
-			printf("warning: destination for %s is a table. Ignoring non-table value (%v)", fullkey, val)
+			printf("warning: destination for %s is a table (a nested map of keys), but the supplied value (%v) is not a table, so it was ignored. If you meant to replace the whole table, unset it first.", fullkey, val)
 		}
 	}
 	return dst

pkg/chart/common/util/coalesce_test.go

@@ -616,9 +616,9 @@ func TestCoalesceValuesWarnings(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Logf("vals: %v", vals)
-	assert.Contains(t, warnings, "warning: skipped value for level1.level2.level3.boat: Not a table.")
-	assert.Contains(t, warnings, "warning: destination for level1.level2.level3.spear.tip is a table. Ignoring non-table value (true)")
-	assert.Contains(t, warnings, "warning: cannot overwrite table with non table for level1.level2.level3.spear.sail (map[cotton:true])")
+	assert.Contains(t, warnings, "warning: skipped value for level1.level2.level3.boat: the chart default here is a table (a nested map of keys), but the supplied value is not, so it was ignored.")
+	assert.Contains(t, warnings, "warning: destination for level1.level2.level3.spear.tip is a table (a nested map of keys), but the supplied value (true) is not a table, so it was ignored. If you meant to replace the whole table, unset it first.")
+	assert.Contains(t, warnings, "warning: cannot overwrite table with non table for level1.level2.level3.spear.sail (map[cotton:true]): the destination is a table (a nested map of keys) but the source value is not, so the source value was ignored.")
 }
 
 func TestConcatPrefix(t *testing.T) {