Skip to content

OCPBUGS-98492: Fix CAPI MachineSet deletion when MAPI MachineSet has already been deleted #626

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

Open
Kaustubh-pande wants to merge 2 commits into
base: main
Choose a base branch
from
+38 −0
Open

OCPBUGS-98492: Fix CAPI MachineSet deletion when MAPI MachineSet has already been deleted #626

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cbc9ab7
Fix CAPI MachineSet finalizer cleanup when MAPI MachineSet is absent
Kaustubh-pande Jul 15, 2026
7f7f713
OCPBUGS-98492: Add regression test and remove unreachable dead code
Kaustubh-pande Jul 16, 2026
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
17 changes: 17 additions & 0 deletions pkg/controllers/machinesetsync/machineset_sync_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,23 @@ func (r *MachineSetSyncReconciler) Reconcile(ctx context.Context, req reconcile.
}

if mapiMachineSet == nil {
if capiMachineSet == nil {
logger.Info("Both MAPI and CAPI machine sets not found, nothing to do")
return ctrl.Result{}, nil
}

Comment thread
coderabbitai[bot] marked this conversation as resolved.
Outdated
// The MAPI MachineSet has already been deleted.
// If the CAPI MachineSet is deleting and still has our sync finalizer,
// reconcile its deletion so the finalizer can be removed.
if shouldRequeue, err := r.reconcileCAPItoMAPIMachineSetDeletion(ctx, nil, capiMachineSet); err != nil {
return ctrl.Result{}, fmt.Errorf(
"failed to reconcile Cluster API machine set deletion: %w",
err,
)
} else if shouldRequeue {
return ctrl.Result{}, nil
}

logger.Info("Only CAPI machine set found, nothing to do")
return ctrl.Result{}, nil
}
Expand Down