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

fix: conflict updating ControlPlane's finalizers is not an error #222

Merged
merged 2 commits into from
Apr 25, 2024
Merged

fix: conflict updating ControlPlane's finalizers is not an error #222

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b0321b
fix: conflict updating ControlPlane's finalizers is not an error
pmalek Apr 24, 2024
b08f973
Merge branch 'main' into conflict-updating-controlplane
pmalek Apr 25, 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
10 changes: 8 additions & 2 deletions controller/controlplane/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,11 +211,17 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
crbFinalizerSet := controllerutil.AddFinalizer(cp, string(ControlPlaneFinalizerCleanupClusterRoleBinding))
vwcFinalizerSet := controllerutil.AddFinalizer(cp, string(ControlPlaneFinalizerCleanupValidatingWebhookConfiguration))
if crFinalizerSet || crbFinalizerSet || vwcFinalizerSet {
log.Trace(logger, "Setting finalizers", cp)
log.Trace(logger, "setting finalizers", cp)
if err := r.Client.Update(ctx, cp); err != nil {
if k8serrors.IsConflict(err) {
log.Debug(logger, "conflict found when updating ControlPlane, retrying", cp)
return ctrl.Result{Requeue: true, RequeueAfter: requeueWithoutBackoff}, nil
}
return ctrl.Result{}, fmt.Errorf("failed updating ControlPlane's finalizers : %w", err)
}
return ctrl.Result{}, nil
// Requeue to ensure that we do not miss next reconciliation request in case
// AddFinalizer calls returned true but the update resulted in a noop.
czeslavo marked this conversation as resolved.
Show resolved Hide resolved
return ctrl.Result{Requeue: true, RequeueAfter: requeueWithoutBackoff}, nil
}

k8sutils.InitReady(cp)
Expand Down
Loading