From d40435623092336b6e0ad084279ba1f608e0463c Mon Sep 17 00:00:00 2001 From: Daniel Elo Date: Fri, 3 Apr 2020 15:01:27 +0200 Subject: [PATCH] feat: fix empty map merge after mergo bump since mergo had been bumped to 0.3.9 an environment value like: ``` affinity: {} ``` was not merged properly (not merged at all) instead it threw an error that it cannot find the key "affinity" in the environment values even though it was outputted in debug output as read in properly. --- pkg/state/envvals_loader.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/state/envvals_loader.go b/pkg/state/envvals_loader.go index 6d5f2141a9a..c5ea8ef6383 100644 --- 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) } }