Merge branch 'main' into main

vmware-tanzu · Feb 21, 2024 · 9211854 · 9211854
2 parents 81159ed + 64ef5b1
commit 9211854
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -108,6 +108,9 @@ spec:
             {{- with .defaultBackupTTL }}
             - --default-backup-ttl={{ . }}
             {{- end }}
+            {{- with .defaultItemOperationTimeout }}
+            - --default-item-operation-timeout={{ . }}
+            {{- end }}
             {{- with .defaultVolumeSnapshotLocations }}
             - --default-volume-snapshot-locations={{ . }}
             {{- end }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -405,6 +405,8 @@ configuration:
   clientQPS:
   # Name of the default backup storage location. Default: default
   defaultBackupStorageLocation:
+  # The default duration any single item operation can take before timing out, especially important for large volume schedules. Default 4h
+  defaultItemOperationTimeout:
   # How long to wait by default before backups can be garbage collected. Default: 72h
   defaultBackupTTL:
   # Name of the default volume snapshot location.