Skip to content

Commit b4fc885

Browse files
Adding Checks for Fleet Existence During Application Deletion
Signed-off-by: LiZhenCheng9527 <lizhencheng6@huawei.com>
1 parent 386cab0 commit b4fc885

1 file changed

Lines changed: 14 additions & 2 deletions

File tree

pkg/fleet-manager/application/controller.go

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,20 @@ func (a *ApplicationManager) reconcileSyncStatus(ctx context.Context, app *appli
316316
}
317317

318318
func (a *ApplicationManager) reconcileDelete(ctx context.Context, app *applicationapi.Application, fleet *fleetapi.Fleet) (ctrl.Result, error) {
319-
if err := a.deleteResourcesInMemberClusters(ctx, app, fleet); err != nil {
320-
return ctrl.Result{}, errors.Wrapf(err, "failed to delete rollout resource in cluster")
319+
log := ctrl.LoggerFrom(ctx)
320+
321+
fleetKey := generateFleetKey(app)
322+
if err := a.Client.Get(ctx, fleetKey, fleet); err != nil {
323+
if apierrors.IsNotFound(err) {
324+
log.Info("delete failed, fleet does not exist", "fleet", fleetKey)
325+
return ctrl.Result{RequeueAfter: fleetmanager.RequeueAfter}, nil
326+
}
327+
log.Error(err, "delete failed, fleet does not found", "fleet", fleetKey)
328+
return ctrl.Result{}, err
329+
}
330+
331+
if deleteErr := a.deleteResourcesInMemberClusters(ctx, app, fleet); deleteErr != nil {
332+
return ctrl.Result{}, errors.Wrapf(deleteErr, "failed to delete rollout resource in cluster")
321333
}
322334

323335
controllerutil.RemoveFinalizer(app, ApplicationFinalizer)

0 commit comments

Comments
 (0)