Skip to content

Commit ed752cb

Browse files
authored
fix: correct post-delete finalizer removal when cluster not found (#24415)
Signed-off-by: Pavel Aborilov <[email protected]>
1 parent 12b1bf5 commit ed752cb

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

controller/appcontroller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1206,7 +1206,7 @@ func (ctrl *ApplicationController) finalizeApplicationDeletion(app *appv1.Applic
12061206
if err != nil {
12071207
logCtx.Warnf("Unable to get destination cluster: %v", err)
12081208
app.UnSetCascadedDeletion()
1209-
app.UnSetPostDeleteFinalizer()
1209+
app.UnSetPostDeleteFinalizerAll()
12101210
if err := ctrl.updateFinalizers(app); err != nil {
12111211
return err
12121212
}

pkg/apis/application/v1alpha1/types.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3316,6 +3316,14 @@ func (app *Application) SetPostDeleteFinalizer(stage ...string) {
33163316
setFinalizer(&app.ObjectMeta, strings.Join(append([]string{PostDeleteFinalizerName}, stage...), "/"), true)
33173317
}
33183318

3319+
func (app *Application) UnSetPostDeleteFinalizerAll() {
3320+
for _, finalizer := range app.Finalizers {
3321+
if strings.HasPrefix(finalizer, PostDeleteFinalizerName) {
3322+
setFinalizer(&app.ObjectMeta, finalizer, false)
3323+
}
3324+
}
3325+
}
3326+
33193327
func (app *Application) UnSetPostDeleteFinalizer(stage ...string) {
33203328
setFinalizer(&app.ObjectMeta, strings.Join(append([]string{PostDeleteFinalizerName}, stage...), "/"), false)
33213329
}

0 commit comments

Comments
 (0)