fix regression that --namespace breaks delete/destroy and possibly sync/apply as well

The problem was that `--namespace NS` had been not taken into account while deleting releases, that resulted in releases that should be deleted are not deleted.
This commit is contained in:
Yusuke Kuoka
2019-11-07 19:53:27 +09:00
parent 8d7c79a323
commit 77082cef58
3 changed files with 41 additions and 24 deletions
+28 -4
View File
@@ -1226,7 +1226,31 @@ func (st *HelmState) Clean() []error {
return nil
}
func MarkFilteredReleases(releases []ReleaseSpec, selectors []string) ([]Release, error) {
func (st *HelmState) GetReleasesWithOverrides() []ReleaseSpec {
var rs []ReleaseSpec
for _, r := range st.Releases {
var spec ReleaseSpec
spec = r
st.ApplyOverrides(&spec)
rs = append(rs, spec)
}
return rs
}
func (st *HelmState) SelectReleasesWithOverrides() ([]Release, error) {
rs, err := markFilteredReleases(st.GetReleasesWithOverrides(), st.Selectors)
if err != nil {
return nil, err
}
for _, r := range rs {
spec := r.ReleaseSpec
st.ApplyOverrides(&spec)
r.ReleaseSpec = spec
}
return rs, nil
}
func markFilteredReleases(releases []ReleaseSpec, selectors []string) ([]Release, error) {
var filteredReleases []Release
filters := []ReleaseFilter{}
for _, label := range selectors {
@@ -1266,8 +1290,8 @@ func MarkFilteredReleases(releases []ReleaseSpec, selectors []string) ([]Release
return filteredReleases, nil
}
func (st *HelmState) GetFilteredReleases() ([]ReleaseSpec, error) {
filteredReleases, err := MarkFilteredReleases(st.Releases, st.Selectors)
func (st *HelmState) GetSelectedReleasesWithOverrides() ([]ReleaseSpec, error) {
filteredReleases, err := st.SelectReleasesWithOverrides()
if err != nil {
return nil, err
}
@@ -1282,7 +1306,7 @@ func (st *HelmState) GetFilteredReleases() ([]ReleaseSpec, error) {
// FilterReleases allows for the execution of helm commands against a subset of the releases in the helmfile.
func (st *HelmState) FilterReleases() error {
releases, err := st.GetFilteredReleases()
releases, err := st.GetSelectedReleasesWithOverrides()
if err != nil {
return err
}
+2 -2
View File
@@ -108,8 +108,8 @@ type PlanOpts struct {
Reverse bool
}
func PlanReleases(releases []ReleaseSpec, selectors []string, reverse bool) ([][]Release, error) {
marked, err := MarkFilteredReleases(releases, selectors)
func (st *HelmState) PlanReleases(reverse bool) ([][]Release, error) {
marked, err := st.SelectReleasesWithOverrides()
if err != nil {
return nil, err
}