Merge pull request #1516 from justinsb/dont_use_requeue_in_controller_runtime

k8s-ci-robot · web-flow · commit a27135058c39 · 2025-08-31T00:47:09.000-07:00
chore: don't use Requeue in controller-runtime
diff --git a/controllers/gcpcluster_controller_test.go b/controllers/gcpcluster_controller_test.go
@@ -55,7 +55,6 @@ var _ = Describe("GCPClusterReconciler", func() {
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(result.RequeueAfter).To(BeZero())
-			Expect(result.Requeue).To(BeFalse())
 		})
 	})
 })
diff --git a/controllers/gcpmachine_controller.go b/controllers/gcpmachine_controller.go
@@ -245,7 +245,7 @@ func (r *GCPMachineReconciler) reconcile(ctx context.Context, machineScope *scop
 	default:
 		machineScope.SetFailureReason("UpdateError")
 		machineScope.SetFailureMessage(errors.Errorf("GCPMachine instance state %s is unexpected", instanceState))
-		return ctrl.Result{Requeue: true}, nil
+		return ctrl.Result{RequeueAfter: reconciler.DefaultRetryTime}, nil
 	}
 }
 
diff --git a/controllers/gcpmachine_controller_test.go b/controllers/gcpmachine_controller_test.go
@@ -47,7 +47,6 @@ var _ = Describe("GCPMachineReconciler", func() {
 			})
 			Expect(err).NotTo(HaveOccurred())
 			Expect(result.RequeueAfter).To(BeZero())
-			Expect(result.Requeue).To(BeFalse())
 		})
 	})
 })
diff --git a/exp/controllers/gcpmanagedcontrolplane_controller.go b/exp/controllers/gcpmanagedcontrolplane_controller.go
@@ -96,7 +96,7 @@ func (r *GCPManagedControlPlaneReconciler) Reconcile(ctx context.Context, req ct
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil
 		}
-		return ctrl.Result{Requeue: true}, nil
+		return ctrl.Result{}, fmt.Errorf("getting GCPManagedControlPlane: %w", err)
 	}
 
 	// Get the cluster
@@ -181,10 +181,6 @@ func (r *GCPManagedControlPlaneReconciler) reconcile(ctx context.Context, manage
 			log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)
 			return res, nil
 		}
-		if res.Requeue {
-			log.V(4).Info("Reconciler requested requeue", "reconciler", name)
-			return res, nil
-		}
 	}
 
 	return ctrl.Result{}, nil
@@ -209,10 +205,6 @@ func (r *GCPManagedControlPlaneReconciler) reconcileDelete(ctx context.Context,
 			log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)
 			return res, nil
 		}
-		if res.Requeue {
-			log.V(4).Info("Reconciler requested requeue", "reconciler", name)
-			return res, nil
-		}
 	}
 
 	if managedControlPlaneScope.GCPManagedControlPlane != nil &&
diff --git a/exp/controllers/gcpmanagedmachinepool_controller.go b/exp/controllers/gcpmanagedmachinepool_controller.go
@@ -237,7 +237,7 @@ func (r *GCPManagedMachinePoolReconciler) Reconcile(ctx context.Context, req ctr
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil
 		}
-		return ctrl.Result{Requeue: true}, nil
+		return ctrl.Result{}, fmt.Errorf("getting GCPManagedMachinePool: %w", err)
 	}
 
 	// Get the machine pool
@@ -354,10 +354,6 @@ func (r *GCPManagedMachinePoolReconciler) reconcile(ctx context.Context, managed
 			log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)
 			return res, nil
 		}
-		if res.Requeue {
-			log.V(4).Info("Reconciler requested requeue", "reconciler", name)
-			return res, nil
-		}
 	}
 
 	return ctrl.Result{}, nil
@@ -390,10 +386,6 @@ func (r *GCPManagedMachinePoolReconciler) reconcileDelete(ctx context.Context, m
 			log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)
 			return res, nil
 		}
-		if res.Requeue {
-			log.V(4).Info("Reconciler requested requeue", "reconciler", name)
-			return res, nil
-		}
 	}
 
 	if conditions.Get(managedMachinePoolScope.GCPManagedMachinePool, infrav1exp.GKEMachinePoolDeletingCondition).Reason == infrav1exp.GKEMachinePoolDeletedReason {

Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ func (r GCPMachineReconciler) reconcile(ctx context.Context, machineScope scop`
`245`	`245`	`default:`
`246`	`246`	`machineScope.SetFailureReason("UpdateError")`
`247`	`247`	`machineScope.SetFailureMessage(errors.Errorf("GCPMachine instance state %s is unexpected", instanceState))`
`248`		`- return ctrl.Result{Requeue: true}, nil`
	`248`	`+ return ctrl.Result{RequeueAfter: reconciler.DefaultRetryTime}, nil`
`249`	`249`	`}`
`250`	`250`	`}`
`251`	`251`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ func (r *GCPManagedControlPlaneReconciler) Reconcile(ctx context.Context, req ct`
`96`	`96`	`if apierrors.IsNotFound(err) {`
`97`	`97`	`return ctrl.Result{}, nil`
`98`	`98`	`}`
`99`		`- return ctrl.Result{Requeue: true}, nil`
	`99`	`+ return ctrl.Result{}, fmt.Errorf("getting GCPManagedControlPlane: %w", err)`
`100`	`100`	`}`
`101`	`101`
`102`	`102`	`// Get the cluster`
`@@ -181,10 +181,6 @@ func (r *GCPManagedControlPlaneReconciler) reconcile(ctx context.Context, manage`
`181`	`181`	`log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)`
`182`	`182`	`return res, nil`
`183`	`183`	`}`
`184`		`- if res.Requeue {`
`185`		`- log.V(4).Info("Reconciler requested requeue", "reconciler", name)`
`186`		`- return res, nil`
`187`		`- }`
`188`	`184`	`}`
`189`	`185`
`190`	`186`	`return ctrl.Result{}, nil`
`@@ -209,10 +205,6 @@ func (r *GCPManagedControlPlaneReconciler) reconcileDelete(ctx context.Context,`
`209`	`205`	`log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)`
`210`	`206`	`return res, nil`
`211`	`207`	`}`
`212`		`- if res.Requeue {`
`213`		`- log.V(4).Info("Reconciler requested requeue", "reconciler", name)`
`214`		`- return res, nil`
`215`		`- }`
`216`	`208`	`}`
`217`	`209`
`218`	`210`	`if managedControlPlaneScope.GCPManagedControlPlane != nil &&`
Original file line number	Diff line number	Diff line change
`@@ -237,7 +237,7 @@ func (r *GCPManagedMachinePoolReconciler) Reconcile(ctx context.Context, req ctr`
`237`	`237`	`if apierrors.IsNotFound(err) {`
`238`	`238`	`return ctrl.Result{}, nil`
`239`	`239`	`}`
`240`		`- return ctrl.Result{Requeue: true}, nil`
	`240`	`+ return ctrl.Result{}, fmt.Errorf("getting GCPManagedMachinePool: %w", err)`
`241`	`241`	`}`
`242`	`242`
`243`	`243`	`// Get the machine pool`
`@@ -354,10 +354,6 @@ func (r *GCPManagedMachinePoolReconciler) reconcile(ctx context.Context, managed`
`354`	`354`	`log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)`
`355`	`355`	`return res, nil`
`356`	`356`	`}`
`357`		`- if res.Requeue {`
`358`		`- log.V(4).Info("Reconciler requested requeue", "reconciler", name)`
`359`		`- return res, nil`
`360`		`- }`
`361`	`357`	`}`
`362`	`358`
`363`	`359`	`return ctrl.Result{}, nil`
`@@ -390,10 +386,6 @@ func (r *GCPManagedMachinePoolReconciler) reconcileDelete(ctx context.Context, m`
`390`	`386`	`log.V(4).Info("Reconciler requested requeueAfter", "reconciler", name, "after", res.RequeueAfter)`
`391`	`387`	`return res, nil`
`392`	`388`	`}`
`393`		`- if res.Requeue {`
`394`		`- log.V(4).Info("Reconciler requested requeue", "reconciler", name)`
`395`		`- return res, nil`
`396`		`- }`
`397`	`389`	`}`
`398`	`390`
`399`	`391`	`if conditions.Get(managedMachinePoolScope.GCPManagedMachinePool, infrav1exp.GKEMachinePoolDeletingCondition).Reason == infrav1exp.GKEMachinePoolDeletedReason {`