Skip to content

fix: improve import controller deletion reconcile #2062

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

Merged
anmazzotti merged 1 commit into from
Feb 9, 2026
Merged

fix: improve import controller deletion reconcile #2062

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
23 changes: 21 additions & 2 deletions internal/controllers/import_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,9 @@ func (r *CAPIImportReconciler) Reconcile(ctx context.Context, req ctrl.Request)
capiCluster := &clusterv1.Cluster{}
if err := r.Client.Get(ctx, req.NamespacedName, capiCluster); err != nil {
if apierrors.IsNotFound(err) {
// These may be requests enqueued from ManagementV3 Cluster deletion,
// for a no longer existing CAPI Cluster.
// Safe to ignore.
return ctrl.Result{RequeueAfter: defaultRequeueDuration}, nil
}

Expand All @@ -146,8 +149,9 @@ func (r *CAPIImportReconciler) Reconcile(ctx context.Context, req ctrl.Request)

log = log.WithValues("cluster", capiCluster.Name)

if capiCluster.DeletionTimestamp.IsZero() && !turtlesannotations.HasClusterImportAnnotation(capiCluster) &&
controllerutil.AddFinalizer(capiCluster, managementv3.CapiClusterFinalizer) {
if capiCluster.DeletionTimestamp.IsZero() &&
!turtlesannotations.HasClusterImportAnnotation(capiCluster) &&
!controllerutil.ContainsFinalizer(capiCluster, managementv3.CapiClusterFinalizer) {
log.Info("CAPI cluster is marked for import, adding finalizer")

if err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
Expand Down Expand Up @@ -223,7 +227,11 @@ func (r *CAPIImportReconciler) reconcile(ctx context.Context, capiCluster *clust
rancherCluster = &rancherClusterList.Items[0]
}

// Reconcile ManagementV3 Cluster deletion.
if rancherCluster != nil && !rancherCluster.DeletionTimestamp.IsZero() {
// Patch CAPI Cluster with:
// 1. `imported=true` annotation to prevent further-reimports.
// 2. Removed capicluster.turtles.cattle.io finalizer to allow deletion.
if err := r.reconcileDelete(ctx, capiCluster); err != nil {
log.Error(err, "Removing CAPI Cluster failed, retrying")
return ctrl.Result{}, err
Expand All @@ -234,12 +242,23 @@ func (r *CAPIImportReconciler) reconcile(ctx context.Context, capiCluster *clust
return ctrl.Result{}, fmt.Errorf("error removing rancher cluster finalizer: %w", err)
}
}

return ctrl.Result{}, nil
}

// Reconcile CAPI Cluster deletion.
if !capiCluster.DeletionTimestamp.IsZero() {
if err := r.deleteDependentRancherCluster(ctx, capiCluster); err != nil {
return ctrl.Result{}, fmt.Errorf("error deleting associated managementv3.Cluster resources: %w", err)
}

if controllerutil.RemoveFinalizer(capiCluster, managementv3.CapiClusterFinalizer) {
if err := r.Client.Update(ctx, capiCluster); err != nil {
return ctrl.Result{}, fmt.Errorf("error removing finalizer from CAPI Cluster: %w", err)
}
}

return ctrl.Result{}, nil
}

patchBase := client.MergeFromWithOptions(rancherCluster.DeepCopy(), client.MergeFromWithOptimisticLock{})
Expand Down
Loading