mirrors/velero
1
0
Fork 0
mirror of https://github.com/vmware-tanzu/velero.git synced 2026-09-20 06:54:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[Backport release-1.18] fix(restore_finalizer): bound WaitRestoreExecHook poll with resourceT… (#10394)
e2e-test-kind.yaml / extract (push) Successful in 16s
Details
Run the E2E test on kind / get-go-version (push) Successful in 17s
Details
Run the E2E test on kind / setup-test-matrix (push) Failing after 3s
Details
push.yml / extract (push) Successful in 12s
Details
Main CI / get-go-version (push) Successful in 14s
Details
Run the E2E test on kind / build (push) Failing after 20s
Details
Run the E2E test on kind / run-e2e-test (push) Skipped
Details
Main CI / Build (push) Failing after 28s
Details

Browse Source 
* fix(restore_finalizer): bound WaitRestoreExecHook poll with resourceT… (#10280)

* fix: reuse DefaultResourceTimeout from server config for hook wait

Signed-off-by: Nitish Malang <71919457+nitishmalang@users.noreply.github.com>

* Add changelog for PR 10280

Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com>

---------

Signed-off-by: Nitish Malang <71919457+nitishmalang@users.noreply.github.com>
Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com>
Co-authored-by: Tiger Kaovilai <passawit.kaovilai@gmail.com>
(cherry picked from commit 1e26cf7ca0)

* Rename 10280-nitishmalang to 10394-nitishmalang

Signed-off-by: lyndon-li <98304688+Lyndon-Li@users.noreply.github.com>

---------

Signed-off-by: Nitish Malang <71919457+nitishmalang@users.noreply.github.com>
Signed-off-by: Tiger Kaovilai <passawit.kaovilai@gmail.com>
Signed-off-by: lyndon-li <98304688+Lyndon-Li@users.noreply.github.com>
Co-authored-by: Nitish Malang <71919457+nitishmalang@users.noreply.github.com>
Co-authored-by: Tiger Kaovilai <passawit.kaovilai@gmail.com>
Co-authored-by: lyndon-li <98304688+Lyndon-Li@users.noreply.github.com>
Co-authored-by: Xun Jiang/Bruce Jiang <59276555+blackpiglet@users.noreply.github.com>
This commit is contained in:
github-actions[bot]
2026-08-28 02:50:27 +00:00
committed by GitHub
co-authored by Nitish Malang Tiger Kaovilai lyndon-li Xun Jiang/Bruce Jiang
parent e2610c7860
commit ddbd646eb7
4 changed files with 41 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cmd/server/config/config.go
+6 -1
View File
@@ -28,6 +28,11 @@ const (
defaultPodVolumeOperationTimeout = 240 * time.Minute
defaultResourceTerminatingTimeout = 10 * time.Minute
// DefaultResourceTimeout is the default for --resource-timeout. It matches
// defaultResourceTerminatingTimeout so controller fallbacks stay aligned with
// server defaults (see pkg/cmd/server/config/config.go).
DefaultResourceTimeout = defaultResourceTerminatingTimeout
// server's client default qps and burst
defaultClientQPS float32 = 100.0
defaultClientBurst int = 100
@@ -41,7 +46,7 @@ const (
defaultCSISnapshotTimeout = 10 * time.Minute
defaultItemOperationTimeout = 4 * time.Hour
resourceTimeout = 10 * time.Minute
resourceTimeout = defaultResourceTerminatingTimeout
defaultMaxConcurrentK8SConnections = 30
defaultDisableInformerCache = false