chore: don't use Requeue in controller-runtime

It is deprecated in newer versions of controller-runtime,
because it should not be used.

Author: justinsb

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())
 		})
 	})
 })

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
 	}
 }
 

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())
 		})
 	})
 })

exp/controllers/gcpmanagedcontrolplane_controller.go

@@ -95,7 +95,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
@@ -180,10 +180,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
@@ -208,10 +204,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 &&

exp/controllers/gcpmanagedmachinepool_controller.go

@@ -236,7 +236,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
@@ -353,10 +353,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
@@ -389,10 +385,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 {