From b4fc8854ddfb6aeea91ca19b6e915773c4fe2c75 Mon Sep 17 00:00:00 2001 From: LiZhenCheng9527 Date: Tue, 20 Feb 2024 20:31:56 +0800 Subject: [PATCH] Adding Checks for Fleet Existence During Application Deletion Signed-off-by: LiZhenCheng9527 --- pkg/fleet-manager/application/controller.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkg/fleet-manager/application/controller.go b/pkg/fleet-manager/application/controller.go index ecb37e7ad..f61504cb3 100644 --- a/pkg/fleet-manager/application/controller.go +++ b/pkg/fleet-manager/application/controller.go @@ -316,8 +316,20 @@ func (a *ApplicationManager) reconcileSyncStatus(ctx context.Context, app *appli } func (a *ApplicationManager) reconcileDelete(ctx context.Context, app *applicationapi.Application, fleet *fleetapi.Fleet) (ctrl.Result, error) { - if err := a.deleteResourcesInMemberClusters(ctx, app, fleet); err != nil { - return ctrl.Result{}, errors.Wrapf(err, "failed to delete rollout resource in cluster") + log := ctrl.LoggerFrom(ctx) + + fleetKey := generateFleetKey(app) + if err := a.Client.Get(ctx, fleetKey, fleet); err != nil { + if apierrors.IsNotFound(err) { + log.Info("delete failed, fleet does not exist", "fleet", fleetKey) + return ctrl.Result{RequeueAfter: fleetmanager.RequeueAfter}, nil + } + log.Error(err, "delete failed, fleet does not found", "fleet", fleetKey) + return ctrl.Result{}, err + } + + if deleteErr := a.deleteResourcesInMemberClusters(ctx, app, fleet); deleteErr != nil { + return ctrl.Result{}, errors.Wrapf(deleteErr, "failed to delete rollout resource in cluster") } controllerutil.RemoveFinalizer(app, ApplicationFinalizer)