Skip to content

Commit f01060a

Browse files
authored
Merge pull request #9588 from killianmuldoon/pr-revert-err-check
[release-1.4] 🐛 Revert ErrClusterLocked check in Machine controller
2 parents 1d954c3 + a2618b9 commit f01060a

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

internal/controllers/machine/machine_controller.go

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,10 +582,6 @@ func (r *Reconciler) drainNode(ctx context.Context, cluster *clusterv1.Cluster,
582582

583583
restConfig, err := remote.RESTConfig(ctx, controllerName, r.Client, util.ObjectKey(cluster))
584584
if err != nil {
585-
if errors.Is(err, remote.ErrClusterLocked) {
586-
log.V(5).Info("Requeuing drain Node because another worker has the lock on the ClusterCacheTracker")
587-
return ctrl.Result{Requeue: true}, nil
588-
}
589585
log.Error(err, "Error creating a remote client for cluster while draining Node, won't retry")
590586
return ctrl.Result{}, nil
591587
}

0 commit comments

Comments
 (0)