public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-21 11:48:10 +02:00
Code Issues Projects Releases Wiki Activity

Fix panic while loading environment secrets (#1164)

Browse Source 
This fixes a regression in #1160
This commit is contained in:
KUOKA Yusuke
2020-03-30 20:13:40 +09:00
committed by GitHub
parent 6643a41ea3
commit 51ecd12360
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/app/desired_state_file_loader.go
+2 -6
View File
@@ -16,7 +16,7 @@ import (
)
const (
DefaultHelmBinary = "helm"
DefaultHelmBinary = state.DefaultHelmBinary
)
type desiredStateLoader struct {
@@ -79,10 +79,6 @@ func (ld *desiredStateLoader) Load(f string, opts LoadOpts) (*state.HelmState, e
st.HelmDefaults.KubeContext = ld.overrideKubeContext
}
if ld.overrideHelmBinary != DefaultHelmBinary || st.DefaultHelmBinary == "" {
st.DefaultHelmBinary = ld.overrideHelmBinary
}
if ld.namespace != "" {
if st.OverrideNamespace != "" {
return nil, errors.New("err: Cannot use option --namespace and set attribute namespace.")
@@ -151,7 +147,7 @@ func (ld *desiredStateLoader) loadFileWithOverrides(inheritedEnv, overrodeEnv *e
}
func (a *desiredStateLoader) underlying() *state.StateCreator {
c := state.NewCreator(a.logger, a.readFile, a.fileExists, a.abs, a.glob, a.valsRuntime, a.getHelm)
c := state.NewCreator(a.logger, a.readFile, a.fileExists, a.abs, a.glob, a.valsRuntime, a.getHelm, a.overrideHelmBinary)
c.LoadFile = a.loadFile
return c
}