Skip to content

🌱 Migrate from Requeue to RequeueAfter in MachinePool tests #13027

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
Nov 21, 2025
+18 −24
Merged

🌱 Migrate from Requeue to RequeueAfter in MachinePool tests #13027

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
6 changes: 0 additions & 6 deletions .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,12 +274,6 @@ linters:
- linters:
- staticcheck
text: 'SA1019: .*\.Deprecated\.V1Beta1.* is deprecated'
# CR v0.21 deprecated Result.Requeue, will be fixed incrementally and tracked via https://github.com/kubernetes-sigs/cluster-api/issues/12272
- linters:
- staticcheck
text: 'SA1019: .*(res|result|i|j)\.Requeue is deprecated: Use `RequeueAfter` instead'
# TODO: Remove Requeue step by step
path: internal/controllers/machinepool
# TODO: var-naming: avoid meaningless package names by revive
# * test/infrastructure/docker/internal/docker/types/
# * bootstrap/kubeadm/types/
Expand Down
36 changes: 18 additions & 18 deletions internal/controllers/machinepool/machinepool_controller_phases_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)

Expand Down Expand Up @@ -190,7 +190,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)
g.Expect(machinepool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhasePending))
Expand Down Expand Up @@ -230,7 +230,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)
g.Expect(machinepool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseProvisioning))
Expand Down Expand Up @@ -286,7 +286,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

// Set ReadyReplicas
machinepool.Status.Deprecated = &clusterv1.MachinePoolDeprecatedStatus{
Expand Down Expand Up @@ -358,7 +358,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

// Set ReadyReplicas
machinepool.Status.Deprecated = &clusterv1.MachinePoolDeprecatedStatus{
Expand Down Expand Up @@ -408,7 +408,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)
g.Expect(machinepool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseProvisioned))
Expand Down Expand Up @@ -461,7 +461,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

// Set ReadyReplicas
machinepool.Status.Deprecated = &clusterv1.MachinePoolDeprecatedStatus{
Expand Down Expand Up @@ -531,7 +531,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

// Set ReadyReplicas
machinepool.Status.Deprecated = &clusterv1.MachinePoolDeprecatedStatus{
Expand Down Expand Up @@ -607,7 +607,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)
g.Expect(machinepool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseDeleting))
Expand Down Expand Up @@ -681,7 +681,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinePool)
g.Expect(machinePool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseRunning))
Expand All @@ -701,7 +701,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
// Reconcile again. The new bootstrap config should be used.
res, err = doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinePool)
g.Expect(*machinePool.Spec.Template.Spec.Bootstrap.DataSecretName).To(Equal("secret-data-new"))
Expand Down Expand Up @@ -777,7 +777,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinePool)
g.Expect(machinePool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseRunning))
Expand All @@ -801,7 +801,7 @@ func TestReconcileMachinePoolPhases(t *testing.T) {
g.Expect(err).ToNot(HaveOccurred())

// Controller should wait until bootstrap provider reports ready bootstrap config
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinePool)

Expand Down Expand Up @@ -1858,7 +1858,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)

Expand Down Expand Up @@ -1926,7 +1926,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)
g.Expect(machinepool.Status.GetTypedPhase()).To(Equal(clusterv1.MachinePoolPhaseRunning))
Expand Down Expand Up @@ -1977,7 +1977,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)

Expand Down Expand Up @@ -2024,7 +2024,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)

Expand Down Expand Up @@ -2093,7 +2093,7 @@ func TestReconcileMachinePoolScaleToFromZero(t *testing.T) {

res, err := doReconcile(ctx, scope, reconcileNormalFuncsForTest(r))
g.Expect(err).ToNot(HaveOccurred())
g.Expect(res.Requeue).To(BeFalse())
g.Expect(res.RequeueAfter).To(Equal(time.Duration(0)))

r.reconcilePhase(machinepool)

Expand Down
Loading