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

Fix multiple --set in --args messed up in `helmfile template` (#1529) 

Fixes #1520
This commit is contained in:
Yusuke Kuoka 2020-10-13 08:38:06 +09:00 committed by GitHub
parent 34acf14d7c
commit 3018e82902
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/app/app.go
View File

@ -1410,6 +1410,15 @@ func (a *App) template(r *Run, c TemplateConfigProvider) (bool, []error) {
// Traverse DAG of all the releases so that we don't suffer from false-positive missing dependencies // Traverse DAG of all the releases so that we don't suffer from false-positive missing dependencies
st.Releases = allReleases st.Releases = allReleases
args := argparser.GetArgs(c.Args(), st)
// Reset the extra args if already set, not to break `helm fetch` by adding the args intended for `lint`
helm.SetExtraArgs()
if len(args) > 0 {
helm.SetExtraArgs(args...)
}
if len(releasesToRender) > 0 { if len(releasesToRender) > 0 {
_, templateErrs := withDAG(st, helm, a.Logger, false, a.Wrap(func(subst *state.HelmState, helm helmexec.Interface) []error { _, templateErrs := withDAG(st, helm, a.Logger, false, a.Wrap(func(subst *state.HelmState, helm helmexec.Interface) []error {
var rs []state.ReleaseSpec var rs []state.ReleaseSpec
@ -1422,7 +1431,6 @@ func (a *App) template(r *Run, c TemplateConfigProvider) (bool, []error) {
subst.Releases = rs subst.Releases = rs
args := argparser.GetArgs(c.Args(), st)
opts := &state.TemplateOpts{ opts := &state.TemplateOpts{
Set: c.Set(), Set: c.Set(),
OutputDirTemplate: c.OutputDirTemplate(), OutputDirTemplate: c.OutputDirTemplate(),

7
pkg/state/state.go
View File

@ -1149,15 +1149,8 @@ func (st *HelmState) TemplateReleases(helm helmexec.Interface, outputDir string,
o.Apply(opts) o.Apply(opts)
} }
// Reset the extra args if already set, not to break `helm fetch` by adding the args intended for `lint`
helm.SetExtraArgs()
errs := []error{} errs := []error{}
if len(args) > 0 {
helm.SetExtraArgs(args...)
}
for i := range st.Releases { for i := range st.Releases {
release := &st.Releases[i] release := &st.Releases[i]