From a93fa1172b7cd9e1ee8f794f6af919f45c8f1b49 Mon Sep 17 00:00:00 2001
From: Andree Klattenhoff <andree.klattenhoff@open-xchange.com>
Date: Wed, 8 Nov 2023 10:59:13 +0100
Subject: [PATCH] Add support to set cpu/memory resources for updater
---
.gitlab/preview/values.yaml | 8 ++++++++
helm/core-ui-middleware/Chart.yaml | 2 +-
helm/core-ui-middleware/templates/deployment.yaml | 2 +-
helm/core-ui-middleware/templates/updater.yaml | 2 +-
helm/core-ui-middleware/values.yaml | 9 +++++++++
5 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/.gitlab/preview/values.yaml b/.gitlab/preview/values.yaml
index dd62d7c..6cf0f87 100644
--- a/.gitlab/preview/values.yaml
+++ b/.gitlab/preview/values.yaml
@@ -27,6 +27,14 @@ core-ui-middleware:
cpu: 100m
memory: 384Mi
+ updater:
+ resources:
+ limits:
+ memory: 384Mi
+ requests:
+ cpu: 100m
+ memory: 384Mi
+
appsuite:
core-ui-middleware:
enabled: false
diff --git a/helm/core-ui-middleware/Chart.yaml b/helm/core-ui-middleware/Chart.yaml
index d0c7504..c97bd48 100644
--- a/helm/core-ui-middleware/Chart.yaml
+++ b/helm/core-ui-middleware/Chart.yaml
@@ -15,7 +15,7 @@ type: application
# This is the chart version. This version number should be incremented each time you make changes
# to the chart and its templates, including the app version.
# Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.0
+version: 3.0.1
# This is the version number of the application being deployed. This version number should be
# incremented each time you make changes to the application. Versions are not expected to
diff --git a/helm/core-ui-middleware/templates/deployment.yaml b/helm/core-ui-middleware/templates/deployment.yaml
index f279390..1634176 100644
--- a/helm/core-ui-middleware/templates/deployment.yaml
+++ b/helm/core-ui-middleware/templates/deployment.yaml
@@ -135,7 +135,7 @@ spec:
- name: REDIS_PREFIX
value: "{{ .Values.redis.prefix }}"
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml .Values.updater.resources | nindent 12 }}
volumeMounts:
- name: manifest-config
mountPath: /app/config/
diff --git a/helm/core-ui-middleware/templates/updater.yaml b/helm/core-ui-middleware/templates/updater.yaml
index 3d42e62..c53ba92 100644
--- a/helm/core-ui-middleware/templates/updater.yaml
+++ b/helm/core-ui-middleware/templates/updater.yaml
@@ -78,7 +78,7 @@ spec:
{{- omit .Values.probe.readiness "enabled" | toYaml | nindent 12 }}
{{- end }}
resources:
- {{- toYaml .Values.resources | nindent 12 }}
+ {{- toYaml .Values.updater.resources | nindent 12 }}
volumeMounts:
- name: manifest-config
mountPath: /app/config/
diff --git a/helm/core-ui-middleware/values.yaml b/helm/core-ui-middleware/values.yaml
index 620cdb1..8f4966e 100644
--- a/helm/core-ui-middleware/values.yaml
+++ b/helm/core-ui-middleware/values.yaml
@@ -78,6 +78,15 @@ resources:
cpu: 500m
memory: 196Mi
+updater:
+ resources:
+ # We recommend to not define a cpu limit for this pod. This pod runs compression of many files in a short time frame.
+ limits:
+ memory: 768Mi
+ requests:
+ cpu: 100m
+ memory: 196Mi
+
autoscaling:
enabled: false
minReplicas: 1
--
GitLab