Change Coalesce to Merge

Signed-off-by: jsvk <850037+jsvk@users.noreply.github.com>

cmd/helm/install_test.go

@@ -196,7 +196,6 @@ func TestInstall(t *testing.T) {
 			name:      "install with schema file, extra values from yaml, with errors",
 			cmd:       "install schema testdata/testcharts/chart-with-schema -f testdata/testcharts/chart-with-schema/extra-values.yaml",
 			wantError: true,
-			golden:    "output/schema-negative.txt",
 		},
 		// Install, values from yaml, extra values from cli, schematized with errors
 		{

cmd/helm/testdata/output/issue-9027.txt

@@ -2,11 +2,15 @@
 # Source: issue-9027/charts/subchart/templates/values.yaml
 global:
   hash:
+    key1: null
+    key2: null
     key3: 13
     key4: 4
     key5: 5
     key6: 6
 hash:
+  key1: null
+  key2: null
   key3: 13
   key4: 4
   key5: 5
@@ -21,11 +25,15 @@ global:
 subchart:
   global:
     hash:
+      key1: null
+      key2: null
       key3: 13
       key4: 4
       key5: 5
       key6: 6
   hash:
+    key1: null
+    key2: null
     key3: 13
     key4: 4
     key5: 5

pkg/chartutil/values.go

@@ -158,7 +158,7 @@ func ToRenderValuesWithSchemaValidation(chrt *chart.Chart, chrtVals map[string]i
 		},
 	}
 
-	vals, err := CoalesceValues(chrt, chrtVals)
+	vals, err := MergeValues(chrt, chrtVals)
 	if err != nil {
 		return top, err
 	}