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

fix: merge environments before loadValuesEntries 

Signed-off-by: Vincent Chenal <vincent.chenal@protonmail.com>
This commit is contained in:
Vincent Chenal 2025-02-10 17:51:22 +01:00
parent e627c7b29a
commit f2830b4cd2
No known key found for this signature in database
GPG Key ID: D0938A925FBBF580
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/state/create.go
View File

@ -278,7 +278,11 @@ func (c *StateCreator) loadEnvValues(st *HelmState, name string, failOnMissingEn
valuesFiles = append(valuesFiles, f) valuesFiles = append(valuesFiles, f)
} }
envValuesEntries := append(valuesFiles, envSpec.Values...) envValuesEntries := append(valuesFiles, envSpec.Values...)
valuesVals, err = st.loadValuesEntries(envSpec.MissingFileHandler, envValuesEntries, c.remote, ctxEnv, name) loadValuesEntriesEnv, err := ctxEnv.Merge(overrode)
if err != nil {
return nil, err
}
valuesVals, err = st.loadValuesEntries(envSpec.MissingFileHandler, envValuesEntries, c.remote, loadValuesEntriesEnv, name)
if err != nil { if err != nil {
return nil, err return nil, err
} }