From d4e03f1e152e35f44889ccbb7f1d0345424fcdda Mon Sep 17 00:00:00 2001 From: Scott Rigby Date: Thu, 6 Jul 2017 11:45:13 -0400 Subject: [PATCH] Revert "New Helm magic to delete a previous values file key" This reverts commit 9697de54eef8f53b2dc93cf6000d61f11beacb48. --- cmd/helm/install.go | 8 -------- 1 file changed, 8 deletions(-) diff --git a/cmd/helm/install.go b/cmd/helm/install.go index 45183ab64..988e7f0a1 100644 --- a/cmd/helm/install.go +++ b/cmd/helm/install.go @@ -273,14 +273,6 @@ func (i *installCmd) run() error { // Merges source and destination map, preferring values from the source map func mergeValues(dest map[string]interface{}, src map[string]interface{}) map[string]interface{} { for k, v := range src { - // If the new value is literally the string "null", remove the value's key. - // This allows helm's multiple value sources (value files or --set) to - // remove incompatible keys from the previous values. - if v == "null" { - delete(dest, k) - continue - } - // If the key doesn't exist already, then just set the key to that value if _, exists := dest[k]; !exists { dest[k] = v