clusterresourceset: requeue after 1 minute if ErrClusterLocked got hit

chrischdi · chrischdi · commit 397ab68cd1d3 · 2023-11-27T18:14:19.000+01:00
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

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,9 @@ func (r *ClusterResourceSetReconciler) Reconcile(ctx context.Context, req ctrl.R`
`166`	`166`
`167`	`167`	`// Requeue if ErrClusterLocked was returned for one of the clusters.`
`168`	`168`	`if errClusterLockedOccurred {`
`169`		`- return ctrl.Result{Requeue: true}, nil`
	`169`	`+ // Requeue after a minute to not end up in exponential delayed requeue which`
	`170`	`+ // could take up to 16m40s.`
	`171`	`+ return ctrl.Result{RequeueAfter: time.Minute}, nil`
`170`	`172`	`}`
`171`	`173`
`172`	`174`	`return ctrl.Result{}, nil`