From 5cc96454f7222d3d26be6b79fe31a37e9f2515e0 Mon Sep 17 00:00:00 2001
From: Mingxiang Xue <mingxiangxue@gmail.com>
Date: Sat, 7 Mar 2020 13:08:44 +0800
Subject: [PATCH] Fix subchart value deletion

Signed-off-by: Mingxiang Xue <mingxiangxue@gmail.com>
---
 pkg/chartutil/coalesce.go                          |  5 +----
 pkg/chartutil/coalesce_test.go                     | 14 ++++++++++++++
 .../moby/charts/pequod/charts/ahab/values.yaml     |  4 ++++
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go
index 9da5c1556..a5ff66aed 100644
--- a/pkg/chartutil/coalesce.go
+++ b/pkg/chartutil/coalesce.go
@@ -47,10 +47,7 @@ func CoalesceValues(chrt *chart.Chart, vals map[string]interface{}) (Values, err
 	if valsCopy == nil {
 		valsCopy = make(map[string]interface{})
 	}
-	if _, err := coalesce(chrt, valsCopy); err != nil {
-		return valsCopy, err
-	}
-	return coalesceDeps(chrt, valsCopy)
+	return coalesce(chrt, valsCopy)
 }
 
 // coalesce coalesces the dest values and the chart values, giving priority to the dest values.
diff --git a/pkg/chartutil/coalesce_test.go b/pkg/chartutil/coalesce_test.go
index fc3531a58..dc1017385 100644
--- a/pkg/chartutil/coalesce_test.go
+++ b/pkg/chartutil/coalesce_test.go
@@ -49,6 +49,10 @@ pequod:
       sail: true
   ahab:
     scope: whale
+    boat: null
+    nested:
+      foo: true
+      bar: null
 `)
 
 func TestCoalesceValues(t *testing.T) {
@@ -88,6 +92,7 @@ func TestCoalesceValues(t *testing.T) {
 		{"{{.pequod.name}}", "pequod"},
 		{"{{.pequod.ahab.name}}", "ahab"},
 		{"{{.pequod.ahab.scope}}", "whale"},
+		{"{{.pequod.ahab.nested.foo}}", "true"},
 		{"{{.pequod.ahab.global.name}}", "Ishmael"},
 		{"{{.pequod.ahab.global.subject}}", "Queequeg"},
 		{"{{.pequod.ahab.global.harpooner}}", "Tashtego"},
@@ -120,6 +125,15 @@ func TestCoalesceValues(t *testing.T) {
 		t.Error("Expected nested boat key to be removed, still present")
 	}
 
+	subchart := v["pequod"].(map[string]interface{})["ahab"].(map[string]interface{})
+	if _, ok := subchart["boat"]; ok {
+		t.Error("Expected subchart boat key to be removed, still present")
+	}
+
+	if _, ok := subchart["nested"].(map[string]interface{})["bar"]; ok {
+		t.Error("Expected subchart nested bar key to be removed, still present")
+	}
+
 	// CoalesceValues should not mutate the passed arguments
 	is.Equal(valsCopy, vals)
 }
diff --git a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml b/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml
index 86c3f63aa..eee6980fa 100644
--- a/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml
+++ b/pkg/chartutil/testdata/moby/charts/pequod/charts/ahab/values.yaml
@@ -1,2 +1,6 @@
 scope: ahab
 name: ahab
+boat: true
+nested:
+  foo: false
+  bar: true