Separate upgradeJob resources header to preserve CLI backwards compat…

…ibility Signed-off-by: Rishabh Raj <rishabhstpaul@gmail.com>
vmware-tanzu · Nov 1, 2023 · 51bc4f0 · 51bc4f0
1 parent 132796a
commit 51bc4f0
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 19 deletions.
diff --git a/charts/velero/templates/deployment.yaml b/charts/velero/templates/deployment.yaml
@@ -155,7 +155,7 @@ spec:
             - --namespace={{ . }}
             {{- end }}
           {{- end }}
-          {{- with .Values.resources.server }}
+          {{- with .Values.resources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/charts/velero/templates/upgrade-crds/upgrade-crds.yaml b/charts/velero/templates/upgrade-crds/upgrade-crds.yaml
@@ -75,7 +75,7 @@ spec:
           args:
             - -c
             - /velero install --crds-only --dry-run -o yaml | /tmp/kubectl apply -f -
-          {{- with .Values.resources.upgradeJob }}
+          {{- with .Values.upgradeJobResources }}
           resources:
             {{- toYaml . | nindent 12 }}
           {{- end }}

diff --git a/charts/velero/values.yaml b/charts/velero/values.yaml
@@ -71,25 +71,24 @@ podLabels: {}
 # Number of old history to retain to allow rollback (If not set, default Kubernetes value is set to 10)
 # revisionHistoryLimit: 1
 
-# Resource requests/limits to specify for the Velero deployment and the upgrade CRDs job.
+# Resource requests/limits to specify for the Velero deployment.
 # https://velero.io/docs/v1.6/customize-installation/#customize-resource-requests-and-limits
 resources:
-# Resource requests for the Velero deployment
-  server:
-    requests:
-      cpu: 500m
-      memory: 128Mi
-    limits:
-      cpu: 1000m
-      memory: 512Mi
-# Resource requests for the upgrade CRDs job
-  upgradeJob:
-    requests:
-      cpu: 50m
-      memory: 64Mi
-    limits:
-      cpu: 100m
-      memory: 128Mi
+  requests:
+    cpu: 500m
+    memory: 128Mi
+  limits:
+    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
 
 # Configure the dnsPolicy of the Velero deployment
 # See: https://kubernetes.io/docs/concepts/services-networking/dns-pod-service/#pod-s-dns-policy