fix the bug that resulted in `helmfile sync` not delete releases with `--namespace`
This commit is contained in:
parent
77082cef58
commit
e2e4e8440d
|
|
@ -914,19 +914,12 @@ func (a *App) sync(r *Run, c SyncConfigProvider) (bool, []error) {
|
|||
return false, errs
|
||||
}
|
||||
|
||||
var toSync []state.ReleaseSpec
|
||||
|
||||
if len(st.Selectors) > 0 {
|
||||
var err error
|
||||
toSync, err = st.GetSelectedReleasesWithOverrides()
|
||||
if err != nil {
|
||||
return false, []error{err}
|
||||
}
|
||||
if len(toSync) == 0 {
|
||||
return false, nil
|
||||
}
|
||||
} else {
|
||||
toSync = st.Releases
|
||||
toSync, err := st.GetSelectedReleasesWithOverrides()
|
||||
if err != nil {
|
||||
return false, []error{err}
|
||||
}
|
||||
if len(toSync) == 0 {
|
||||
return false, nil
|
||||
}
|
||||
|
||||
toDelete, err := st.DetectReleasesToBeDeletedForSync(helm, toSync)
|
||||
|
|
|
|||
|
|
@ -1242,11 +1242,6 @@ func (st *HelmState) SelectReleasesWithOverrides() ([]Release, error) {
|
|||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
for _, r := range rs {
|
||||
spec := r.ReleaseSpec
|
||||
st.ApplyOverrides(&spec)
|
||||
r.ReleaseSpec = spec
|
||||
}
|
||||
return rs, nil
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue