fix: [backport-2.7] override with a higher memory limit (#2247) (#2250)

* fix: override with a higher memory limit (#2247) and also explicitly put the chart defaults down in our default CM (cherry picked from commit 70b4cc2) * chore: bump velero k-app version
mesosphere · Jul 9, 2024 · 7e26c0f · 7e26c0f
1 parent 27801e2
commit 7e26c0f
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 0 deletions.
diff --git a/services/velero/4.1.1/defaults/cm.yaml → services/velero/4.1.2/defaults/cm.yaml b/services/velero/4.1.1/defaults/cm.yaml → services/velero/4.1.2/defaults/cm.yaml
@@ -7,6 +7,15 @@ data:
   values.yaml: |
     ---
     priorityClassName: "dkp-critical-priority"
+    resources:
+      # these are from the chart defaults
+      # except memory limit, which the default 512Mi can be short when it's during a restoration run
+      requests:
+        cpu: 500m
+        memory: 128Mi
+      limits:
+        cpu: 1000m
+        memory: 2Gi
     configuration:
       backupStorageLocation:
         - bucket: dkp-velero

diff --git a/.../velero/4.1.1/defaults/kustomization.yaml → .../velero/4.1.2/defaults/kustomization.yaml b/.../velero/4.1.1/defaults/kustomization.yaml → .../velero/4.1.2/defaults/kustomization.yaml
diff --git a/...1.1/grafana-dashboards/kustomization.yaml → ...1.2/grafana-dashboards/kustomization.yaml b/...1.1/grafana-dashboards/kustomization.yaml → ...1.2/grafana-dashboards/kustomization.yaml
diff --git a/...lero/4.1.1/grafana-dashboards/velero.json → ...lero/4.1.2/grafana-dashboards/velero.json b/...lero/4.1.1/grafana-dashboards/velero.json → ...lero/4.1.2/grafana-dashboards/velero.json
diff --git a/...velero/4.1.1/helmrelease/helmrelease.yaml → ...velero/4.1.2/helmrelease/helmrelease.yaml b/...velero/4.1.1/helmrelease/helmrelease.yaml → ...velero/4.1.2/helmrelease/helmrelease.yaml
diff --git a/services/velero/4.1.1/kustomization.yaml → services/velero/4.1.2/kustomization.yaml b/services/velero/4.1.1/kustomization.yaml → services/velero/4.1.2/kustomization.yaml
diff --git a/...loyment_update-backupstoragelocation.yaml → ...loyment_update-backupstoragelocation.yaml b/...loyment_update-backupstoragelocation.yaml → ...loyment_update-backupstoragelocation.yaml
diff --git a/...ro/4.1.1/pre-install/pre-install-job.yaml → ...ro/4.1.2/pre-install/pre-install-job.yaml b/...ro/4.1.1/pre-install/pre-install-job.yaml → ...ro/4.1.2/pre-install/pre-install-job.yaml
diff --git a/...ces/velero/4.1.1/velero-post-install.yaml → ...ces/velero/4.1.2/velero-post-install.yaml b/...ces/velero/4.1.1/velero-post-install.yaml → ...ces/velero/4.1.2/velero-post-install.yaml
diff --git a/...ices/velero/4.1.1/velero-pre-install.yaml → ...ices/velero/4.1.2/velero-pre-install.yaml b/...ices/velero/4.1.1/velero-pre-install.yaml → ...ices/velero/4.1.2/velero-pre-install.yaml
diff --git a/services/velero/4.1.1/velero.yaml → services/velero/4.1.2/velero.yaml b/services/velero/4.1.1/velero.yaml → services/velero/4.1.2/velero.yaml