Skip to content

[release-1.10] chore: don't use Requeue in controller-runtime #1520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 1, 2025
+3 −21
Merged

[release-1.10] chore: don't use Requeue in controller-runtime #1520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion controllers/gcpcluster_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ var _ = Describe("GCPClusterReconciler", func() {
})
Expect(err).NotTo(HaveOccurred())
Expect(result.RequeueAfter).To(BeZero())
Expect(result.Requeue).To(BeFalse())
})
})
})
2 changes: 1 addition & 1 deletion controllers/gcpmachine_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}

Expand Down
1 change: 0 additions & 1 deletion controllers/gcpmachine_controller_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ var _ = Describe("GCPMachineReconciler", func() {
})
Expect(err).NotTo(HaveOccurred())
Expect(result.RequeueAfter).To(BeZero())
Expect(result.Requeue).To(BeFalse())
})
})
})
10 changes: 1 addition & 9 deletions exp/controllers/gcpmanagedcontrolplane_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 &&
Expand Down
10 changes: 1 addition & 9 deletions exp/controllers/gcpmanagedmachinepool_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,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
Expand Down Expand Up @@ -349,10 +349,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
Expand Down Expand Up @@ -385,10 +381,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 {
Expand Down