Skip to content

Commit 2a47f68

Browse files
tariq-hasantariq-hasan
committed
chore: replace deprecated Result.Requeue with RequeueAfter
Signed-off-by: tariq-hasan <mmtariquehsn@gmail.com>
1 parent e2ee163 commit 2a47f68

7 files changed

Lines changed: 40 additions & 47 deletions

File tree

‎.golangci.yaml‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,6 @@ linters:
4848
- pkg: sigs.k8s.io/controller-runtime
4949
alias: ctrl
5050

51-
exclusions:
52-
rules:
53-
# exclude staticcheck SA1019 for Result.Requeue.
54-
- linters:
55-
- staticcheck
56-
text: "SA1019: .*\\.Requeue is deprecated: Use `RequeueAfter` instead."
57-
5851
issues:
5952
# Maximum issues count per one linter.
6053
# Set to 0 to disable.
@@ -69,4 +62,3 @@ formatters:
6962
enable:
7063
# Check import statements are formatted according to the 'goimport' command.
7164
- goimports
72-

‎internal/controller/mutatingwebhookconfiguration/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, options controller.Optio
7979
func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
8080
logger.Info("Updating CA bundle of MutatingWebhookConfiguration", "name", req.Name)
8181
if err := r.updateMutatingWebhookConfiguration(ctx, req.NamespacedName); err != nil {
82-
return ctrl.Result{Requeue: true}, err
82+
return ctrl.Result{}, err
8383
}
8484
return ctrl.Result{}, nil
8585
}

‎internal/controller/scheduledsparkapplication/controller.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
124124
if errors.IsNotFound(err) {
125125
return ctrl.Result{}, nil
126126
}
127-
return ctrl.Result{Requeue: true}, err
127+
return ctrl.Result{}, err
128128
}
129129
scheduledApp := oldScheduledApp.DeepCopy()
130130
logger.Info("Reconciling ScheduledSparkApplication", "name", scheduledApp.Name, "namespace", scheduledApp.Namespace, "state", scheduledApp.Status.ScheduleState)
@@ -144,7 +144,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
144144
scheduledApp.Status.ScheduleState = v1beta2.ScheduleStateFailedValidation
145145
scheduledApp.Status.Reason = fmt.Sprintf("Invalid timezone: %v", err)
146146
if updateErr := r.updateScheduledSparkApplicationStatus(ctx, scheduledApp); updateErr != nil {
147-
return ctrl.Result{Requeue: true}, updateErr
147+
return ctrl.Result{}, updateErr
148148
}
149149
return ctrl.Result{}, nil
150150
}
@@ -162,7 +162,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
162162
scheduledApp.Status.ScheduleState = v1beta2.ScheduleStateFailedValidation
163163
scheduledApp.Status.Reason = parseErr.Error()
164164
if updateErr := r.updateScheduledSparkApplicationStatus(ctx, scheduledApp); updateErr != nil {
165-
return ctrl.Result{Requeue: true}, updateErr
165+
return ctrl.Result{}, updateErr
166166
}
167167
return ctrl.Result{}, nil
168168
}
@@ -177,7 +177,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
177177
}
178178
scheduledApp.Status.ScheduleState = v1beta2.ScheduleStateScheduled
179179
if err := r.updateScheduledSparkApplicationStatus(ctx, scheduledApp); err != nil {
180-
return ctrl.Result{Requeue: true}, err
180+
return ctrl.Result{}, err
181181
}
182182
return ctrl.Result{RequeueAfter: nextRunTime.Sub(now)}, err
183183
case v1beta2.ScheduleStateScheduled:
@@ -186,7 +186,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
186186
if nextRunTime.IsZero() {
187187
scheduledApp.Status.NextRun = metav1.NewTime(schedule.Next(now))
188188
if err := r.updateScheduledSparkApplicationStatus(ctx, scheduledApp); err != nil {
189-
return ctrl.Result{Requeue: true}, err
189+
return ctrl.Result{}, err
190190
}
191191
return ctrl.Result{RequeueAfter: schedule.Next(now).Sub(now)}, nil
192192
}
@@ -197,7 +197,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
197197

198198
ok, err := r.shouldStartNextRun(scheduledApp)
199199
if err != nil {
200-
return ctrl.Result{Requeue: true}, err
200+
return ctrl.Result{}, err
201201
}
202202
if !ok {
203203
return ctrl.Result{RequeueAfter: schedule.Next(now).Sub(now)}, nil
@@ -214,10 +214,10 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
214214
scheduledApp.Status.LastRunName = app.Name
215215
scheduledApp.Status.NextRun = metav1.NewTime(schedule.Next(now))
216216
if err = r.checkAndUpdatePastRuns(ctx, scheduledApp); err != nil {
217-
return ctrl.Result{Requeue: true}, err
217+
return ctrl.Result{}, err
218218
}
219219
if err := r.updateScheduledSparkApplicationStatus(ctx, scheduledApp); err != nil {
220-
return ctrl.Result{Requeue: true}, err
220+
return ctrl.Result{}, err
221221
}
222222
return ctrl.Result{RequeueAfter: schedule.Next(now).Sub(now)}, nil
223223
case v1beta2.ScheduleStateFailedValidation:

‎internal/controller/sparkapplication/controller.go‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Resu
186186
if errors.IsNotFound(err) {
187187
return ctrl.Result{}, nil
188188
}
189-
return ctrl.Result{Requeue: true}, err
189+
return ctrl.Result{}, err
190190
}
191191

192192
logger.Info("Reconciling SparkApplication", "state", app.Status.AppState.State)
@@ -290,12 +290,12 @@ func (r *Reconciler) handleSparkApplicationDeletion(ctx context.Context, req ctr
290290
if errors.IsNotFound(err) {
291291
return ctrl.Result{}, nil
292292
}
293-
return ctrl.Result{Requeue: true}, err
293+
return ctrl.Result{}, err
294294
}
295295

296296
if err := r.deleteSparkResources(ctx, app); err != nil {
297297
logger.Error(err, "Failed to delete resources associated with SparkApplication")
298-
return ctrl.Result{Requeue: true}, err
298+
return ctrl.Result{}, err
299299
}
300300
return ctrl.Result{}, nil
301301
}
@@ -324,7 +324,7 @@ func (r *Reconciler) reconcileNewSparkApplication(ctx context.Context, req ctrl.
324324
)
325325
if retryErr != nil {
326326
logger.Error(retryErr, "Failed to reconcile SparkApplication")
327-
return ctrl.Result{Requeue: true}, retryErr
327+
return ctrl.Result{}, retryErr
328328
}
329329
return ctrl.Result{}, nil
330330
}
@@ -667,7 +667,7 @@ func (r *Reconciler) reconcileTerminatedSparkApplication(ctx context.Context, re
667667
key := req.NamespacedName
668668
old, err := r.getSparkApplication(ctx, key)
669669
if err != nil {
670-
return ctrl.Result{Requeue: true}, err
670+
return ctrl.Result{}, err
671671
}
672672

673673
app := old.DeepCopy()
@@ -678,22 +678,22 @@ func (r *Reconciler) reconcileTerminatedSparkApplication(ctx context.Context, re
678678
if util.IsExpired(app) {
679679
logger.Info("Deleting expired SparkApplication", "state", app.Status.AppState.State)
680680
if err := r.client.Delete(ctx, app); err != nil {
681-
return ctrl.Result{Requeue: true}, err
681+
return ctrl.Result{}, err
682682
}
683683
return ctrl.Result{}, nil
684684
}
685685

686686
if err := r.updateExecutorState(ctx, app); err != nil {
687-
return ctrl.Result{Requeue: true}, err
687+
return ctrl.Result{}, err
688688
}
689689

690690
if err := r.updateSparkApplicationStatus(ctx, app); err != nil {
691-
return ctrl.Result{Requeue: true}, err
691+
return ctrl.Result{}, err
692692
}
693693

694694
if err := r.cleanUpOnTermination(ctx, old, app); err != nil {
695695
logger.Error(err, "Failed to clean up resources for SparkApplication", "state", old.Status.AppState.State)
696-
return ctrl.Result{Requeue: true}, err
696+
return ctrl.Result{}, err
697697
}
698698

699699
// If termination time or TTL is not set, will not requeue this application.
@@ -708,7 +708,7 @@ func (r *Reconciler) reconcileTerminatedSparkApplication(ctx context.Context, re
708708

709709
// If survival time is greater than TTL, requeue the application immediately.
710710
if survival >= ttl {
711-
return ctrl.Result{Requeue: true}, nil
711+
return ctrl.Result{RequeueAfter: time.Second}, nil
712712
}
713713
// Otherwise, requeue the application after (TTL - survival) seconds.
714714
return ctrl.Result{RequeueAfter: ttl - survival}, nil
@@ -851,7 +851,7 @@ func (r *Reconciler) reconcileResumingSparkApplication(ctx context.Context, req
851851
)
852852
if retryErr != nil {
853853
logger.Error(retryErr, "Failed to reconcile SparkApplication")
854-
return ctrl.Result{Requeue: true}, retryErr
854+
return ctrl.Result{}, retryErr
855855
}
856856
return ctrl.Result{}, nil
857857
}
@@ -878,7 +878,7 @@ func (r *Reconciler) transitionToSuspending(ctx context.Context, req ctrl.Reques
878878
)
879879
if retryErr != nil {
880880
logger.Error(retryErr, "Failed to reconcile SparkApplication")
881-
return ctrl.Result{Requeue: true}, retryErr
881+
return ctrl.Result{}, retryErr
882882
}
883883
return ctrl.Result{}, nil
884884
}

‎internal/controller/sparkapplication/controller_test.go‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ var _ = Describe("SparkApplication Controller", func() {
342342
)
343343
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
344344
Expect(err).NotTo(HaveOccurred())
345-
Expect(result.Requeue).To(BeFalse())
345+
Expect(result.RequeueAfter).To(BeZero())
346346

347347
app := &v1beta2.SparkApplication{}
348348
Expect(k8sClient.Get(ctx, key, app)).To(Succeed())
@@ -409,7 +409,7 @@ var _ = Describe("SparkApplication Controller", func() {
409409
)
410410
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
411411
Expect(err).NotTo(HaveOccurred())
412-
Expect(result.Requeue).To(BeFalse())
412+
Expect(result.RequeueAfter).To(BeZero())
413413

414414
app := &v1beta2.SparkApplication{}
415415
Expect(k8sClient.Get(ctx, key, app)).To(Succeed())
@@ -471,7 +471,7 @@ var _ = Describe("SparkApplication Controller", func() {
471471
)
472472
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
473473
Expect(err).NotTo(HaveOccurred())
474-
Expect(result.Requeue).To(BeFalse())
474+
Expect(result.RequeueAfter).To(BeZero())
475475
})
476476
})
477477

@@ -531,7 +531,7 @@ var _ = Describe("SparkApplication Controller", func() {
531531
)
532532
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
533533
Expect(err).NotTo(HaveOccurred())
534-
Expect(result.Requeue).To(BeFalse())
534+
Expect(result.RequeueAfter).To(BeZero())
535535
})
536536
})
537537

@@ -586,7 +586,7 @@ var _ = Describe("SparkApplication Controller", func() {
586586
)
587587
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
588588
Expect(err).NotTo(HaveOccurred())
589-
Expect(result.Requeue).To(BeFalse())
589+
Expect(result.RequeueAfter).To(BeZero())
590590
})
591591
})
592592

@@ -646,7 +646,7 @@ var _ = Describe("SparkApplication Controller", func() {
646646
)
647647
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
648648
Expect(err).NotTo(HaveOccurred())
649-
Expect(result.Requeue).To(BeFalse())
649+
Expect(result.RequeueAfter).To(BeZero())
650650
})
651651
})
652652

@@ -729,7 +729,7 @@ var _ = Describe("SparkApplication Controller", func() {
729729
)
730730
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
731731
Expect(err).NotTo(HaveOccurred())
732-
Expect(result.Requeue).To(BeFalse())
732+
Expect(result.RequeueAfter).To(BeZero())
733733

734734
app := &v1beta2.SparkApplication{}
735735
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -749,7 +749,7 @@ var _ = Describe("SparkApplication Controller", func() {
749749
)
750750
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
751751
Expect(err).NotTo(HaveOccurred())
752-
Expect(result.Requeue).To(BeFalse())
752+
Expect(result.RequeueAfter).To(BeZero())
753753

754754
app := &v1beta2.SparkApplication{}
755755
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1079,7 +1079,7 @@ var _ = Describe("SparkApplication Controller", func() {
10791079
)
10801080
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
10811081
Expect(err).NotTo(HaveOccurred())
1082-
Expect(result.Requeue).To(BeFalse())
1082+
Expect(result.RequeueAfter).To(BeZero())
10831083

10841084
app := &v1beta2.SparkApplication{}
10851085
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1145,7 +1145,7 @@ var _ = Describe("SparkApplication Controller", func() {
11451145
)
11461146
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
11471147
Expect(err).NotTo(HaveOccurred())
1148-
Expect(result.Requeue).To(BeFalse())
1148+
Expect(result.RequeueAfter).To(BeZero())
11491149

11501150
app := &v1beta2.SparkApplication{}
11511151
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1179,7 +1179,7 @@ var _ = Describe("SparkApplication Controller", func() {
11791179
)
11801180
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
11811181
Expect(err).NotTo(HaveOccurred())
1182-
Expect(result.Requeue).To(BeFalse())
1182+
Expect(result.RequeueAfter).To(BeZero())
11831183

11841184
app := &v1beta2.SparkApplication{}
11851185
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1213,7 +1213,7 @@ var _ = Describe("SparkApplication Controller", func() {
12131213
)
12141214
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
12151215
Expect(err).NotTo(HaveOccurred())
1216-
Expect(result.Requeue).To(BeFalse())
1216+
Expect(result.RequeueAfter).To(BeZero())
12171217

12181218
app := &v1beta2.SparkApplication{}
12191219
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1257,7 +1257,7 @@ var _ = Describe("SparkApplication Controller", func() {
12571257
)
12581258
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
12591259
Expect(err).NotTo(HaveOccurred())
1260-
Expect(result.Requeue).To(BeFalse())
1260+
Expect(result.RequeueAfter).To(BeZero())
12611261

12621262
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(driverPod), &corev1.Pod{})).To(Satisfy(errors.IsNotFound))
12631263
app := &v1beta2.SparkApplication{}
@@ -1294,7 +1294,7 @@ var _ = Describe("SparkApplication Controller", func() {
12941294
)
12951295
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
12961296
Expect(err).NotTo(HaveOccurred())
1297-
Expect(result.Requeue).To(BeFalse())
1297+
Expect(result.RequeueAfter).To(BeZero())
12981298

12991299
app := &v1beta2.SparkApplication{}
13001300
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
@@ -1338,7 +1338,7 @@ var _ = Describe("SparkApplication Controller", func() {
13381338
)
13391339
result, err := reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
13401340
Expect(err).NotTo(HaveOccurred())
1341-
Expect(result.Requeue).To(BeFalse())
1341+
Expect(result.RequeueAfter).To(BeZero())
13421342

13431343
Expect(k8sClient.Get(ctx, client.ObjectKeyFromObject(driverPod), &corev1.Pod{})).To(Satisfy(errors.IsNotFound))
13441344
app := &v1beta2.SparkApplication{}
@@ -1348,7 +1348,7 @@ var _ = Describe("SparkApplication Controller", func() {
13481348
By("Reconciling the Suspended SparkApplication with Suspend=false")
13491349
result, err = reconciler.Reconcile(ctx, reconcile.Request{NamespacedName: key})
13501350
Expect(err).NotTo(HaveOccurred())
1351-
Expect(result.Requeue).To(BeFalse())
1351+
Expect(result.RequeueAfter).To(BeZero())
13521352
app = &v1beta2.SparkApplication{}
13531353
Expect(k8sClient.Get(ctx, key, app)).NotTo(HaveOccurred())
13541354
Expect(app.Status.AppState).To(BeEquivalentTo(v1beta2.ApplicationState{State: v1beta2.ApplicationStateResuming}))

‎internal/controller/sparkconnect/reconciler.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ import (
2020
"context"
2121
"fmt"
2222
"strings"
23+
"time"
2324

2425
corev1 "k8s.io/api/core/v1"
2526
"k8s.io/apimachinery/pkg/api/equality"
@@ -230,7 +231,7 @@ func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (reconcile
230231
if err := r.updateSparkConnectStatus(ctx, old, conn); err != nil {
231232
if errors.IsConflict(err) {
232233
logger.V(1).Info("conflict updating SparkConnect status")
233-
return ctrl.Result{Requeue: true}, nil
234+
return ctrl.Result{RequeueAfter: time.Second}, nil
234235
}
235236
return ctrl.Result{}, fmt.Errorf("failed to update SparkConnect status: %v", err)
236237
}

‎internal/controller/validatingwebhookconfiguration/controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ func (r *Reconciler) SetupWithManager(mgr ctrl.Manager, options controller.Optio
8080
func (r *Reconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
8181
logger.Info("Updating CA bundle of ValidatingWebhookConfiguration", "name", req.Name)
8282
if err := r.updateValidatingWebhookConfiguration(ctx, req.NamespacedName); err != nil {
83-
return ctrl.Result{Requeue: true}, nil
83+
return ctrl.Result{}, err
8484
}
8585
return ctrl.Result{}, nil
8686
}

0 commit comments

Comments
 (0)