mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-30 03:36:12 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Delete Requeue from ctrl.Result, because Requeue is deprecated by controller-runtime.

Browse Source 
The change is used to address the linter issue after golangci-lint bump to v2.13.1.
Requeue is replaced by RequeueAfter.

Signed-off-by: Xun Jiang <xun.jiang@broadcom.com>
This commit is contained in:
Xun Jiang
2026-08-27 17:50:52 +08:00
parent 32db614154
commit 69dbce1fea
10 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/controller/server_status_request_controller_test.go
+5 -5
View File
@@ -125,7 +125,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
},
}).
Result(),
expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod},
expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod},
}),
Entry("with phase=new will be processed and phased successfully patched", request{
req: statusRequestBuilder("1").
@@ -158,7 +158,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
},
}).
Result(),
expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod},
expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod},
}),
Entry("with phase=Processed does not get deleted if not expired", request{
req: statusRequestBuilder("1").
@@ -191,7 +191,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
},
}).
Result(),
expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod},
expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod},
}),
Entry("with phase=Processed gets deleted if expired", request{
req: statusRequestBuilder("1").
@@ -214,7 +214,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
},
},
expected: nil,
expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: statusRequestResyncPeriod},
expectedRequeue: ctrl.Result{RequeueAfter: statusRequestResyncPeriod},
}),
Entry("with invalid phase returns an error and does not requeue", request{
req: statusRequestBuilder("1").
@@ -237,7 +237,7 @@ var _ = Describe("Server Status Request Reconciler", func() {
},
},
expectedErrMsg: "unexpected ServerStatusRequest phase",
expectedRequeue: ctrl.Result{Requeue: false, RequeueAfter: 0},
expectedRequeue: ctrl.Result{RequeueAfter: 0},
}),
)
})