public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-18 05:15:44 +02:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
pkg/app/app.go
+11 -18
View File
@@ -451,7 +451,7 @@ func printBatches(batches [][]state.Release) string {
}
func withDAG(templated *state.HelmState, helm helmexec.Interface, logger *zap.SugaredLogger, reverse bool, converge func(*state.HelmState, helmexec.Interface) (bool, []error)) (bool, []error) {
batches, err := state.PlanReleases(templated.Releases, templated.Selectors, reverse)
batches, err := templated.PlanReleases(reverse)
if err != nil {
return false, []error{err}
}
@@ -679,7 +679,7 @@ func (a *App) apply(r *Run, c ApplyConfigProvider) (bool, []error) {
Set: c.Set(),
}
allReleases := st.Releases
allReleases := st.GetReleasesWithOverrides()
var changedReleases []state.ReleaseSpec
var deletingReleases []state.ReleaseSpec
@@ -688,7 +688,7 @@ func (a *App) apply(r *Run, c ApplyConfigProvider) (bool, []error) {
// TODO Better way to detect diff on only filtered releases
{
if len(st.Selectors) > 0 {
releases, err := st.GetFilteredReleases()
releases, err := st.GetSelectedReleasesWithOverrides()
if err != nil {
return false, []error{err}
}
@@ -835,19 +835,12 @@ func (a *App) delete(r *Run, purge bool, c DestroyConfigProvider) (bool, []error
affectedReleases := state.AffectedReleases{}
var toSync []state.ReleaseSpec
if len(st.Selectors) > 0 {
var err error
toSync, err = st.GetFilteredReleases()
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.DetectReleasesToBeDeleted(helm, toSync)
@@ -925,7 +918,7 @@ func (a *App) sync(r *Run, c SyncConfigProvider) (bool, []error) {
if len(st.Selectors) > 0 {
var err error
toSync, err = st.GetFilteredReleases()
toSync, err = st.GetSelectedReleasesWithOverrides()
if err != nil {
return false, []error{err}
}
@@ -1047,7 +1040,7 @@ func (a *App) template(r *Run, c TemplateConfigProvider) (bool, []error) {
if len(st.Selectors) > 0 {
var err error
templatedReleases, err = st.GetFilteredReleases()
templatedReleases, err = st.GetSelectedReleasesWithOverrides()
if err != nil {
return false, []error{err}
}