fix: helmfile apply and sync should properly delete releases (#555)
Since #526, `helmfile apply` have been really able to detect deletion of the last release only, and `sync` has been unable to mark releases with `installed: false` for removal. Fixes #554
This commit is contained in:
parent
f53c66749e
commit
04a9ea1d2a
|
|
@ -206,9 +206,6 @@ type syncPrepareResult struct {
|
||||||
func (st *HelmState) prepareSyncReleases(helm helmexec.Interface, additionalValues []string, concurrency int) ([]syncPrepareResult, []error) {
|
func (st *HelmState) prepareSyncReleases(helm helmexec.Interface, additionalValues []string, concurrency int) ([]syncPrepareResult, []error) {
|
||||||
releases := []*ReleaseSpec{}
|
releases := []*ReleaseSpec{}
|
||||||
for i, _ := range st.Releases {
|
for i, _ := range st.Releases {
|
||||||
if !st.Releases[i].Desired() {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
releases = append(releases, &st.Releases[i])
|
releases = append(releases, &st.Releases[i])
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -297,7 +294,9 @@ func (st *HelmState) DetectReleasesToBeDeleted(helm helmexec.Interface) ([]*Rele
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
} else if installed {
|
} else if installed {
|
||||||
detected = append(detected, &release)
|
// Otherwise `release` messed up(https://github.com/roboll/helmfile/issues/554)
|
||||||
|
r := release
|
||||||
|
detected = append(detected, &r)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue