Revert "New Helm magic to delete a previous values file key"

This reverts commit 9697de54ee.
reviewable/pr2648/r2
Scott Rigby 8 years ago
parent 9697de54ee
commit d4e03f1e15

@ -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

Loading…
Cancel
Save