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

Revert "fix: cleanup hooks not receiving error signal" 

This reverts commit d77c72f82e.

Signed-off-by: Felipe Santos <felipecassiors@gmail.com>
This commit is contained in:
Felipe Santos 2024-09-29 12:42:01 -03:00
parent d77c72f82e
commit 29babda186
2 changed files with 11 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/app/app.go
View File

@ -1552,13 +1552,7 @@ Do you really want to apply?
for id := range releasesWithNoChange { for id := range releasesWithNoChange {
r := releasesWithNoChange[id] r := releasesWithNoChange[id]
if _, err := st.TriggerCleanupEvent(&r, "apply"); err != nil {
var firstErr error = nil
if len(errs) > 0 {
firstErr = errs[0]
}
if _, err := st.TriggerCleanupEvent(&r, firstErr, "apply"); err != nil {
a.Logger.Warnf("warn: %v\n", err) a.Logger.Warnf("warn: %v\n", err)
} }
} }
@ -1607,7 +1601,7 @@ func (a *App) delete(r *Run, purge bool, c DestroyConfigProvider) (bool, []error
for id := range releasesWithNoChange { for id := range releasesWithNoChange {
r := releasesWithNoChange[id] r := releasesWithNoChange[id]
if _, err := st.TriggerCleanupEvent(&r, nil, "delete"); err != nil { if _, err := st.TriggerCleanupEvent(&r, "delete"); err != nil {
a.Logger.Warnf("warn: %v\n", err) a.Logger.Warnf("warn: %v\n", err)
} }
} }
@ -1853,7 +1847,7 @@ func (a *App) sync(r *Run, c SyncConfigProvider) (bool, []error) {
for id := range releasesWithNoChange { for id := range releasesWithNoChange {
r := releasesWithNoChange[id] r := releasesWithNoChange[id]
if _, err := st.TriggerCleanupEvent(&r, nil, "sync"); err != nil { if _, err := st.TriggerCleanupEvent(&r, "sync"); err != nil {
a.Logger.Warnf("warn: %v\n", err) a.Logger.Warnf("warn: %v\n", err)
} }
} }

26
pkg/state/state.go
View File

@ -892,7 +892,7 @@ func (st *HelmState) DeleteReleasesForSync(affectedReleases *AffectedReleases, h
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
if _, err := st.TriggerCleanupEvent(release, relErr, "sync"); err != nil { if _, err := st.TriggerCleanupEvent(release, "sync"); err != nil {
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
@ -1018,7 +1018,7 @@ func (st *HelmState) SyncReleases(affectedReleases *AffectedReleases, helm helme
} }
} }
if _, err := st.TriggerCleanupEvent(release, relErr, "sync"); err != nil { if _, err := st.TriggerCleanupEvent(release, "sync"); err != nil {
if relErr == nil { if relErr == nil {
relErr = newReleaseFailedError(release, err) relErr = newReleaseFailedError(release, err)
} else { } else {
@ -1548,12 +1548,7 @@ func (st *HelmState) TemplateReleases(helm helmexec.Interface, outputDir string,
} }
} }
var firstErr error = nil if _, err := st.TriggerCleanupEvent(release, "template"); err != nil {
if len(errs) > 0 {
firstErr = errs[0]
}
if _, err := st.TriggerCleanupEvent(release, firstErr, "template"); err != nil {
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
} }
@ -1654,7 +1649,7 @@ func (st *HelmState) WriteReleasesValues(helm helmexec.Interface, additionalValu
return []error{fmt.Errorf("writing values file %s: %w", outputValuesFile, err)} return []error{fmt.Errorf("writing values file %s: %w", outputValuesFile, err)}
} }
if _, err := st.TriggerCleanupEvent(release, nil, "write-values"); err != nil { if _, err := st.TriggerCleanupEvent(release, "write-values"); err != nil {
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
} }
@ -1729,12 +1724,7 @@ func (st *HelmState) LintReleases(helm helmexec.Interface, additionalValues []st
} }
} }
var firstErr error = nil if _, err := st.TriggerCleanupEvent(&release, "lint"); err != nil {
if len(errs) > 0 {
firstErr = errs[0]
}
if _, err := st.TriggerCleanupEvent(&release, firstErr, "lint"); err != nil {
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
} }
@ -2081,7 +2071,7 @@ func (st *HelmState) DiffReleases(helm helmexec.Interface, additionalValues []st
} }
if triggerCleanupEvents { if triggerCleanupEvents {
if _, err := st.TriggerCleanupEvent(prep.release, nil, "diff"); err != nil { if _, err := st.TriggerCleanupEvent(prep.release, "diff"); err != nil {
st.logger.Warnf("warn: %v\n", err) st.logger.Warnf("warn: %v\n", err)
} }
} }
@ -2435,8 +2425,8 @@ func (st *HelmState) triggerPrepareEvent(r *ReleaseSpec, helmfileCommand string)
return st.triggerReleaseEvent("prepare", nil, r, helmfileCommand) return st.triggerReleaseEvent("prepare", nil, r, helmfileCommand)
} }
func (st *HelmState) TriggerCleanupEvent(r *ReleaseSpec, evtErr error, helmfileCommand string) (bool, error) { func (st *HelmState) TriggerCleanupEvent(r *ReleaseSpec, helmfileCommand string) (bool, error) {
return st.triggerReleaseEvent("cleanup", evtErr, r, helmfileCommand) return st.triggerReleaseEvent("cleanup", nil, r, helmfileCommand)
} }
func (st *HelmState) triggerPresyncEvent(r *ReleaseSpec, helmfileCommand string) (bool, error) { func (st *HelmState) triggerPresyncEvent(r *ReleaseSpec, helmfileCommand string) (bool, error) {