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

fix the bug that resulted in `helmfile sync` not delete releases with `--namespace`

This commit is contained in:
Yusuke Kuoka 2019-11-07 20:48:55 +09:00
parent 77082cef58
commit e2e4e8440d
2 changed files with 6 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
pkg/app/app.go
View File

@ -914,19 +914,12 @@ func (a *App) sync(r *Run, c SyncConfigProvider) (bool, []error) {
return false, errs return false, errs
} }
var toSync []state.ReleaseSpec toSync, err := st.GetSelectedReleasesWithOverrides()
if err != nil {
if len(st.Selectors) > 0 { return false, []error{err}
var err error }
toSync, err = st.GetSelectedReleasesWithOverrides() if len(toSync) == 0 {
if err != nil { return false, nil
return false, []error{err}
}
if len(toSync) == 0 {
return false, nil
}
} else {
toSync = st.Releases
} }
toDelete, err := st.DetectReleasesToBeDeletedForSync(helm, toSync) toDelete, err := st.DetectReleasesToBeDeletedForSync(helm, toSync)

5
pkg/state/state.go
View File

@ -1242,11 +1242,6 @@ func (st *HelmState) SelectReleasesWithOverrides() ([]Release, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
for _, r := range rs {
spec := r.ReleaseSpec
st.ApplyOverrides(&spec)
r.ReleaseSpec = spec
}
return rs, nil return rs, nil
} }