From 645f01eb22e03b5995b1b90834dc7321b4d813ed Mon Sep 17 00:00:00 2001
From: Scott Rigby <scott@r6by.com>
Date: Fri, 7 Jul 2017 13:37:35 -0400
Subject: [PATCH] New Helm functionality to delete a coalesced YAML key when
the value is nil.
- Note that this covers all YAML null syntax options:
ref: http://yaml.org/type/null.html
- Note that we do a nil comparison because the encoding/yaml package parses
YAML properly and any variation of null, Null, NULL, or ~ is converted to nil
by the time we get here.
---
pkg/chartutil/values.go | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/pkg/chartutil/values.go b/pkg/chartutil/values.go
index cc60860cd..a2343555e 100644
--- a/pkg/chartutil/values.go
+++ b/pkg/chartutil/values.go
@@ -281,6 +281,13 @@ func coalesceValues(c *chart.Chart, v map[string]interface{}) (map[string]interf
if _, ok := v[key]; !ok {
// If the key is not in v, copy it from nv.
v[key] = val
+ } else if ok && v[key] == nil {
+ // When the YAML value is null, we remove the value's key.
+ // This allows Helm's various sources of values (value files or --set) to
+ // remove incompatible keys from any previous chart, file, or set values.
+ // ref: http://www.yaml.org/spec/1.2/spec.html#id2803362
+ delete(v, key)
+ continue
} else if dest, ok := v[key].(map[string]interface{}); ok {
// if v[key] is a table, merge nv's val table into v[key].
src, ok := val.(map[string]interface{})
--
GitLab