diff --git a/controllers/serviceaccount_controller.go b/controllers/serviceaccount_controller.go index 590d9fdcfd..86ce715bce 100644 --- a/controllers/serviceaccount_controller.go +++ b/controllers/serviceaccount_controller.go @@ -23,6 +23,7 @@ import ( "reflect" "strconv" "strings" + "time" "github.com/pkg/errors" corev1 "k8s.io/api/core/v1" @@ -210,7 +211,7 @@ func (r *ServiceAccountReconciler) Reconcile(ctx context.Context, req reconcile. if err != nil { if errors.Is(err, remote.ErrClusterLocked) { log.V(5).Info("Requeuing because another worker has the lock on the ClusterCacheTracker") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Minute}, nil } log.Error(err, "The control plane is not ready yet") return reconcile.Result{RequeueAfter: clusterNotReadyRequeueTime}, nil diff --git a/controllers/servicediscovery_controller.go b/controllers/servicediscovery_controller.go index c6eb2d93d1..8ad52da860 100644 --- a/controllers/servicediscovery_controller.go +++ b/controllers/servicediscovery_controller.go @@ -189,7 +189,7 @@ func (r *serviceDiscoveryReconciler) Reconcile(ctx context.Context, req reconcil if err != nil { if errors.Is(err, remote.ErrClusterLocked) { log.V(5).Info("Requeuing because another worker has the lock on the ClusterCacheTracker") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Minute}, nil } log.Error(err, "The control plane is not ready yet") return reconcile.Result{RequeueAfter: clusterNotReadyRequeueTime}, nil diff --git a/controllers/vspherevm_controller.go b/controllers/vspherevm_controller.go index 5a6aad74b6..e57f4b96d5 100644 --- a/controllers/vspherevm_controller.go +++ b/controllers/vspherevm_controller.go @@ -373,7 +373,7 @@ func (r vmReconciler) deleteNode(ctx context.Context, vmCtx *capvcontext.VMConte if err != nil { if errors.Is(err, remote.ErrClusterLocked) { log.V(5).Info("Requeuing because another worker has the lock on the ClusterCacheTracker") - return ctrl.Result{Requeue: true}, nil + return ctrl.Result{RequeueAfter: time.Minute}, nil } return ctrl.Result{}, err }