Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Checks for Fleet Existence During Application Deletion #605

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+22 −4
Open

Add Checks for Fleet Existence During Application Deletion #605

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b4fc885
Adding Checks for Fleet Existence During Application Deletion
LiZhenCheng9527 Feb 20, 2024
f765001
Performs application delete, regardless of whether the fleet exists
LiZhenCheng9527 Feb 21, 2024
4b3cbd7
check for errors when deleting fleet and provides logs
LiZhenCheng9527 Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 22 additions & 4 deletions pkg/fleet-manager/application/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,7 +150,7 @@ func (a *ApplicationManager) Reconcile(ctx context.Context, req ctrl.Request) (_

// Handle deletion reconciliation loop.
if app.DeletionTimestamp != nil {
return a.reconcileDelete(ctx, app, fleet)
return a.reconcileDelete(ctx, app)
}

// Handle normal loop.
Expand Down Expand Up @@ -315,9 +315,27 @@ func (a *ApplicationManager) reconcileSyncStatus(ctx context.Context, app *appli
return nil
}

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")
// Handling Application Deletion Based on Fleet Availability.
// When deleting an application, the approach taken depends on whether the managing fleet can be retrieved
// If the fleet is available:
// Application will be removed
// Resources related to the application will then be deleted from fleet clusters
// If the fleet cannot be retrieved:
// Only the application object itself will be removed
// Related resources in any cluster will be left intact
func (a *ApplicationManager) reconcileDelete(ctx context.Context, app *applicationapi.Application) (ctrl.Result, error) {
log := ctrl.LoggerFrom(ctx)
fleetKey := generateFleetKey(app)
fleet := &fleetapi.Fleet{}
if err := a.Client.Get(ctx, fleetKey, fleet); err != nil {
if apierrors.IsNotFound(err) {
log.Info("fleet does not exist", "fleet", fleetKey)
}
log.Info("failed to get fleet", "fleet", fleetKey, "error", err)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

not right. You should return only for this error.

} else {
if deleteErr := a.deleteResourcesInMemberClusters(ctx, app, fleet); deleteErr != nil {
return ctrl.Result{}, errors.Wrapf(deleteErr, "failed to delete rollout resource in member clusters")
}
}

controllerutil.RemoveFinalizer(app, ApplicationFinalizer)
Expand Down
Loading