Merge branch 'main' into tpl-config-reload

Author: jkroepke

charts/velero/values.yaml

@@ -81,14 +81,14 @@ resources:
     cpu: 1000m
     memory: 512Mi
 
-# Resource requests/limits to specify for the upgradeCRDs job pod.
-upgradeJobResources:
-  requests:
-    cpu: 50m
-    memory: 64Mi
-  limits:
-    cpu: 100m
-    memory: 128Mi
+# Resource requests/limits to specify for the upgradeCRDs job pod. Need to be adjusted by user accordingly.
+upgradeJobResources: {}
+# requests:
+#     cpu: 50m
+#     memory: 128Mi
+#   limits:
+#     cpu: 100m
+#     memory: 256Mi
 
 # Configure the dnsPolicy of the Velero deployment
 # See: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy