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

implement deletion retries #304

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

implement deletion retries #304

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions controllers/helmrelease_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,21 +638,21 @@ func (r *HelmReleaseReconciler) reconcileDelete(ctx context.Context, hr v2.HelmR

// Delete the HelmChart that belongs to this resource.
if err := r.deleteHelmChart(ctx, &hr); err != nil {
return ctrl.Result{}, err
return ctrl.Result{Requeue: true}, err
}

// Only uninstall the Helm Release if the resource is not suspended.
if !hr.Spec.Suspend {
getter, err := r.getRESTClientGetter(ctx, hr)
if err != nil {
return ctrl.Result{}, err
return ctrl.Result{Requeue: true}, err
}
run, err := runner.NewRunner(getter, hr.GetStorageNamespace(), logr.FromContext(ctx))
if err != nil {
return ctrl.Result{}, err
return ctrl.Result{Requeue: true}, err
}
if err := run.Uninstall(hr); err != nil && !errors.Is(err, driver.ErrReleaseNotFound) {
return ctrl.Result{}, err
return ctrl.Result{Requeue: true}, err
}
logr.FromContext(ctx).Info("uninstalled Helm release for deleted resource")

Expand All @@ -663,7 +663,7 @@ func (r *HelmReleaseReconciler) reconcileDelete(ctx context.Context, hr v2.HelmR
// Remove our finalizer from the list and update it.
controllerutil.RemoveFinalizer(&hr, v2.HelmReleaseFinalizer)
if err := r.Update(ctx, &hr); err != nil {
return ctrl.Result{}, err
return ctrl.Result{Requeue: true}, err
}

return ctrl.Result{}, nil
Expand Down