Merge pull request helm#1169 from elodani/master

fix: empty map merge was not working after mergo bump
Nordix · Apr 4, 2020 · 25aae67 · 25aae67
2 parents 51ecd12 + d404356
commit 25aae67
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/state/envvals_loader.go b/pkg/state/envvals_loader.go
@@ -73,7 +73,7 @@ func (ld *EnvironmentValuesLoader) LoadEnvironmentValues(missingFileHandler *str
 			if err != nil {
 				return nil, err
 			}
-			if err := mergo.Merge(&result, &vals, mergo.WithOverride); err != nil {
+			if err := mergo.Merge(&result, &vals, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
 				return nil, fmt.Errorf("failed to merge %v: %v", m, err)
 			}
 		}