mirror of
https://github.com/vmware-tanzu/velero.git
synced 2026-09-29 11:16:08 +00:00
v1.4.1 cherrypicks (#2704)
* Adjust restic timeout and pod values up (#2696) * Adjust restic timeout and pod values up Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * 🐛 Use CRD version prior to remap_crd_version backup item action (#2683) * 🐛 preserve crd version before remapping Signed-off-by: Ashish Amarnath <ashisham@vmware.com> * 🏃♂️ pass git state to build from makefile Signed-off-by: Ashish Amarnath <ashisham@vmware.com> * Add scripts for tagging Velero releases (#2592) * Add release tools Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Document the tag-release release tool Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Make sure the upstream used is correct Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Add copyright statement Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Address review feedback * Pause to allow for cherry-picking on the release branch before pushing it * Move master branch logic into an else statement * Correct typo Signed-off-by: Nolan Brubaker <brubakern@vmware.com> * Uncomment check for dirty git working tree Signed-off-by: Nolan Brubaker <brubakern@vmware.com> Co-authored-by: Ashish Amarnath <ashisham@vmware.com>
This commit is contained in:
co-authored by
Ashish Amarnath
parent
5963650c9d
commit
100541d9c2
@@ -75,7 +75,7 @@ const (
|
||||
defaultMetricsAddress = ":8085"
|
||||
|
||||
defaultBackupSyncPeriod = time.Minute
|
||||
defaultPodVolumeOperationTimeout = 60 * time.Minute
|
||||
defaultPodVolumeOperationTimeout = 240 * time.Minute
|
||||
defaultResourceTerminatingTimeout = 10 * time.Minute
|
||||
|
||||
// server's client default qps and burst
|
||||
|
||||
Reference in New Issue
Block a user