public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: .Values is missing keys with zero values (#1185) 

Ref #1184
This commit is contained in:
KUOKA Yusuke 2020-04-10 08:21:23 +09:00 committed by GitHub
parent 71635caace
commit 98886df5d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/state/create.go
View File

@ -235,7 +235,7 @@ func (c *StateCreator) loadEnvValues(st *HelmState, name string, failOnMissingEn
if ctxEnv != nil { if ctxEnv != nil {
intEnv := *ctxEnv intEnv := *ctxEnv
if err := mergo.Merge(&intEnv, newEnv, mergo.WithOverride); err != nil { if err := mergo.Merge(&intEnv, newEnv, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
return nil, fmt.Errorf("error while merging environment values for \"%s\": %v", name, err) return nil, fmt.Errorf("error while merging environment values for \"%s\": %v", name, err)
} }
@ -303,7 +303,7 @@ func (c *StateCreator) scatterGatherEnvSecretFiles(st *HelmState, envSecretFiles
if result.err != nil { if result.err != nil {
errs = append(errs, result.err) errs = append(errs, result.err)
} else { } else {
if err := mergo.Merge(&envVals, &result.result, mergo.WithOverride); err != nil { if err := mergo.Merge(&envVals, &result.result, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
errs = append(errs, fmt.Errorf("failed to load environment secrets file \"%s\": %v", result.path, err)) errs = append(errs, fmt.Errorf("failed to load environment secrets file \"%s\": %v", result.path, err))
} }
} }

4
pkg/state/state_exec_tmpl.go
View File

@ -13,10 +13,10 @@ import (
func (st *HelmState) Values() (map[string]interface{}, error) { func (st *HelmState) Values() (map[string]interface{}, error) {
vals := map[string]interface{}{} vals := map[string]interface{}{}
if err := mergo.Merge(&vals, st.Env.Defaults, mergo.WithOverride); err != nil { if err := mergo.Merge(&vals, st.Env.Defaults, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
return nil, err return nil, err
} }
if err := mergo.Merge(&vals, st.Env.Values, mergo.WithOverride); err != nil { if err := mergo.Merge(&vals, st.Env.Values, mergo.WithOverride, mergo.WithOverwriteWithEmptyValue); err != nil {
return nil, err return nil, err
} }