From f2830b4cd2086cca9859514a390628b48809359c Mon Sep 17 00:00:00 2001 From: Vincent Chenal Date: Mon, 10 Feb 2025 17:51:22 +0100 Subject: [PATCH] fix: merge environments before loadValuesEntries Signed-off-by: Vincent Chenal --- pkg/state/create.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkg/state/create.go b/pkg/state/create.go index c08086d4..ab2fa6b2 100644 --- a/pkg/state/create.go +++ b/pkg/state/create.go @@ -278,7 +278,11 @@ func (c *StateCreator) loadEnvValues(st *HelmState, name string, failOnMissingEn valuesFiles = append(valuesFiles, f) } 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 { return nil, err }