Merge pull request #9787 from k8s-infra-cherrypick-robot/cherry-pick-…

…9777-to-release-1.5 [release-1.5] 🐛 clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit
kubernetes-sigs · Nov 28, 2023 · 1eb9be9 · 1eb9be9
2 parents fd9f333 + dbfa88a
commit 1eb9be9
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/exp/addons/internal/controllers/clusterresourceset_controller.go b/exp/addons/internal/controllers/clusterresourceset_controller.go
@@ -166,7 +166,9 @@ func (r *ClusterResourceSetReconciler) Reconcile(ctx context.Context, req ctrl.R
 
 	// Requeue if ErrClusterLocked was returned for one of the clusters.
 	if errClusterLockedOccurred {
-		return ctrl.Result{Requeue: true}, nil
+		// Requeue after a minute to not end up in exponential delayed requeue which
+		// could take up to 16m40s.
+		return ctrl.Result{RequeueAfter: time.Minute}, nil
 	}
 
 	return ctrl.Result{}, nil