From c0bcd5958cca28145336453425ac6098aff13930 Mon Sep 17 00:00:00 2001 From: Marshall Anschutz Date: Fri, 8 Nov 2019 13:06:41 -0600 Subject: [PATCH] Resolve #6899 Gives priority to dst when the src parameter is nil Signed-off-by: Marshall --- pkg/chartutil/coalesce.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/chartutil/coalesce.go b/pkg/chartutil/coalesce.go index bbdd5f21c..30a91c533 100644 --- a/pkg/chartutil/coalesce.go +++ b/pkg/chartutil/coalesce.go @@ -180,7 +180,10 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) { // // dest is considered authoritative. func CoalesceTables(dst, src map[string]interface{}) map[string]interface{} { - if dst == nil || src == nil { + if src == nil { + return dst + } + if dst == nil { return src } // Because dest has higher precedence than src, dest values override src