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

fix kubeContext does not globally defaulting its value (#1829) 

Ref #1810
This commit is contained in:
katsew 2021-05-08 17:35:46 +09:00 committed by GitHub
parent cb7fa6bf63
commit 58954109fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkg/state/state_exec_tmpl.go
View File

@ -17,10 +17,6 @@ func (st *HelmState) Values() map[string]interface{} {
} }
func (st *HelmState) createReleaseTemplateData(release *ReleaseSpec, vals map[string]interface{}) releaseTemplateData { func (st *HelmState) createReleaseTemplateData(release *ReleaseSpec, vals map[string]interface{}) releaseTemplateData {
kubeContext := release.KubeContext
if kubeContext == "" {
kubeContext = st.HelmDefaults.KubeContext
}
tmplData := releaseTemplateData{ tmplData := releaseTemplateData{
Environment: st.Env, Environment: st.Env,
KubeContext: st.OverrideKubeContext, KubeContext: st.OverrideKubeContext,
@ -32,7 +28,7 @@ func (st *HelmState) createReleaseTemplateData(release *ReleaseSpec, vals map[st
Chart: release.Chart, Chart: release.Chart,
Namespace: release.Namespace, Namespace: release.Namespace,
Labels: release.Labels, Labels: release.Labels,
KubeContext: kubeContext, KubeContext: release.KubeContext,
}, },
} }
tmplData.StateValues = &tmplData.Values tmplData.StateValues = &tmplData.Values
@ -94,6 +90,9 @@ func (st *HelmState) ExecuteTemplates() (*HelmState, error) {
vals := st.Values() vals := st.Values()
for i, rt := range st.Releases { for i, rt := range st.Releases {
if rt.KubeContext == "" {
rt.KubeContext = r.HelmDefaults.KubeContext
}
if rt.Labels == nil { if rt.Labels == nil {
rt.Labels = map[string]string{} rt.Labels = map[string]string{}
} }