fix(services): Update resource requests and remove cpu limits

2025-12-06 07:21:36 +01:00 · 2023-11-21 21:49:00 +01:00
parent 71d11cfcd0
commit f86a74ba10
4 changed files with 247 additions and 126 deletions
--- a/helmfile/apps/intercom-service/values.gotmpl
+++ b/helmfile/apps/intercom-service/values.gotmpl
@@ -46,4 +46,7 @@ ingress:
  tls:
    enabled: {{ .Values.ingress.tls.enabled }}
    secretName: {{ .Values.ingress.tls.secretName | quote }}
+
+resources:
+  {{ .Values.resources.intercomService | toYaml | nindent 2 }}
 ...
--- a/helmfile/apps/nextcloud/values-nextcloud.gotmpl
+++ b/helmfile/apps/nextcloud/values-nextcloud.gotmpl
@@ -49,6 +49,8 @@ metrics:
    enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
    labels:
      {{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 6 }}
+  resources:
+    {{ .Values.resources.nextcloudMetrics | toYaml | nindent 4 }}

 {{- if .Values.cluster.persistence.readWriteMany.enabled }}
 replicaCount: {{ .Values.replicas.nextcloud }}
--- a/helmfile/apps/open-xchange/values-openxchange.gotmpl
+++ b/helmfile/apps/open-xchange/values-openxchange.gotmpl
@@ -25,6 +25,8 @@ nextcloud-integration-ui:
  {{- range .Values.global.imagePullSecrets }}
    - name: {{ . | quote }}
  {{- end }}
+  resources:
+    {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}

 public-sector-ui:
  image:
@@ -35,6 +37,8 @@ public-sector-ui:
    - name: {{ . | quote }}
  {{- end }}
  pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  resources:
+    {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}

 appsuite:
  istio:
@@ -62,6 +66,8 @@ appsuite:
        repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGotenberg.repository }}"
        tag: {{ .Values.images.openxchangeGotenberg.tag | quote }}
        pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+      resources:
+        {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
    properties:
      "com.openexchange.oauth.provider.jwt.jwksUri": "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap/protocol/openid-connect/certs"
      "com.openexchange.oauth.provider.allowedIssuer": "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap"
@@ -119,6 +125,8 @@ appsuite:
    {{- range .Values.global.imagePullSecrets }}
      - name: {{ . | quote }}
    {{- end }}
+    resources:
+      {{ .Values.resources.openxchangeCoreMW | toYaml | nindent 6 }}

  core-ui:
    imagePullSecrets:
@@ -129,6 +137,8 @@ appsuite:
      repository: {{ .Values.images.openxchangeCoreUI.repository | quote }}
      tag: {{ .Values.images.openxchangeCoreUI.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    resources:
+      {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}

  core-ui-middleware:
    ingress:
@@ -146,13 +156,18 @@ appsuite:
    redis:
      auth:
        password: {{ .Values.secrets.redis.password | quote }}
+    resources:
+      {{ .Values.resources.openxchangeCoreUIMiddleware | toYaml | nindent 6 }}
+      updater:
+      resources:
+        {{ .Values.resources.openxchangeCoreUIMiddlewareUpdater | toYaml | nindent 6 }}

  core-documentconverter:
    image:
      repository: {{ .Values.images.openxchangeDocumentConverter.repository | quote }}
      tag: {{ .Values.images.openxchangeDocumentConverter.tag | quote }}
    resources:
-      {{- .Values.resources.oxDocumentConverter | toYaml | nindent 6 }}
+      {{- .Values.resources.openxchangeCoreDocumentConverter | toYaml | nindent 6 }}

  core-guidedtours:
    imagePullSecrets:
@@ -163,11 +178,15 @@ appsuite:
      repository: {{ .Values.images.openxchangeCoreGuidedtours.repository | quote }}
      tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    resources:
+      {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}

  core-imageconverter:
    image:
      repository: {{ .Values.images.openxchangeImageConverter.repository | quote }}
      tag: {{ .Values.images.openxchangeImageConverter.tag | quote }}
+    resources:
+      {{- .Values.resources.openxchangeCoreImageConverter | toYaml | nindent 6 }}

  guard-ui:
    imagePullSecrets:
@@ -178,6 +197,8 @@ appsuite:
      repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGuardUI.repository }}"
      tag: {{ .Values.images.openxchangeGuardUI.tag | quote }}
      pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+    resources:
+      {{- .Values.resources.openxchangeGuardUI | toYaml | nindent 6 }}

  core-user-guide:
    image:
@@ -188,4 +209,6 @@ appsuite:
    {{- range .Values.global.imagePullSecrets }}
      - name: {{ . | quote }}
    {{- end }}
+    resources:
+      {{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}
 ...
--- a/helmfile/environments/default/resources.yaml
+++ b/helmfile/environments/default/resources.yaml
@@ -1,362 +1,455 @@
 # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 # SPDX-License-Identifier: Apache-2.0
 ---
+# Some charts do not support null or ~ values, because they use their default values.
+# To not limit the CPU, we set all CPU limits to 99.
 resources:
  clamd:
    limits:
-      cpu: 4
+      cpu: 99
      memory: "4Gi"
    requests:
      cpu: 0.1
-      memory: "2Gi"
+      memory: "1.5Gi"
  collabora:
    limits:
-      cpu: 4
+      cpu: 99
      memory: "4Gi"
    requests:
      cpu: 0.5
-      memory: "1Gi"
+      memory: "512Mi"
  cryptpad:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "2Gi"
    requests:
      cpu: 0.1
      memory: "512Mi"
  dovecot:
    limits:
-      cpu: 0.5
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
  element:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "32Mi"
  freshclam:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "96Mi"
  icap:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "128Mi"
    requests:
      cpu: 0.1
      memory: "16Mi"
+  intercomService:
+    limits:
+      cpu: 99
+      memory: "128Mi"
+    requests:
+      cpu: 0.1
+      memory: "64Mi"
  jibri:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "768Mi"
    requests:
      cpu: 0.1
-      memory: "125Mi"
+      memory: "384Mi"
  jicofo:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "512Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "256Mi"
  jitsi:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "512Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
  jitsiKeycloakAdapter:
    limits:
-      cpu: "100m"
+      cpu: 99
      memory: "128Mi"
    requests:
      cpu: "10m"
-      memory: "16Mi"
+      memory: "48Mi"
  jvb:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "768Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "384Mi"
  keycloak:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "2Gi"
    requests:
      cpu: 0.1
-      memory: "750Mi"
+      memory: "512Mi"
  keycloakExtension:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "48Mi"
  keycloakBootstrap:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "512Mi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  keycloakProxy:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "48Mi"
  mariadb:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "2Gi"
    requests:
      cpu: 0.1
-      memory: "500Mi"
+      memory: "384Mi"
  matrixNeoBoardWidget:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "128Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
  matrixNeoChoiceWidget:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
  matrixNeoDateFixBot:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "512Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "128Mi"
  matrixNeoDateFixWidget:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
  matrixUserVerificationService:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "128Mi"
  memcached:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "256Mi"
    requests:
      cpu: 0.1
      memory: "32Mi"
  milter:
    limits:
-      cpu: 4
-      memory: "4Gi"
+      cpu: 99
+      memory: "96Mi"
    requests:
      cpu: 0.1
-      memory: "2Gi"
+      memory: "16Mi"
  minio:
    limits:
-      cpu: 2
-      memory: "4Gi"
+      cpu: 99
+      memory: "2Gi"
    requests:
      cpu: 0.25
-      memory: "1Gi"
+      memory: "256Mi"
  nextcloud:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "500Mi"
+      memory: "512Mi"
+  nextcloudMetrics:
+    limits:
+      cpu: 99
+      memory: "128Mi"
+    requests:
+      cpu: 0.1
+      memory: "32Mi"
  openproject:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
-  oxConnector:
+      memory: "768Mi"
+  openxchangeCoreDocumentConverter:
    limits:
-      cpu: 2
-      memory: "2Gi"
-    requests:
-      cpu: 0.1
-      memory: "250Mi"
-  oxDocumentConverter:
-    limits:
-      cpu: 2
+      cpu: 99
      memory: "2Gi"
    requests:
      cpu: 0.25
-      memory: "1Gi"
+      memory: "1.25Gi"
+  openxchangeCoreGuidedtours:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.01
+      memory: "32Mi"
+  openxchangeCoreImageConverter:
+    limits:
+      cpu: 99
+      memory: "2Gi"
+    requests:
+      cpu: 0.5
+      memory: "1.25Gi"
+  openxchangeCoreMW:
+    limits:
+      cpu: 99
+      memory: "8Gi"
+    requests:
+      cpu: 1
+      memory: "1.25Gi"
+  openxchangeCoreUI:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.01
+      memory: "32Mi"
+  openxchangeCoreUIMiddleware:
+    limits:
+      cpu: 99
+      memory: "768Mi"
+    requests:
+      cpu: 0.5
+      memory: "192Mi"
+  openxchangeCoreUIMiddlewareUpdater:
+    limits:
+      cpu: 99
+      memory: "768Mi"
+    requests:
+      cpu: 0.5
+      memory: "192Mi"
+  openxchangeCoreUserGuide:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.02
+      memory: "32Mi"
+  openxchangeGotenberg:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.05
+      memory: "32Mi"
+  openxchangeGuardUI:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.01
+      memory: "32Mi"
+  openxchangeNextcloudIntegrationUI:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.01
+      memory: "32Mi"
+  openxchangePublicSectorUI:
+    limits:
+      cpu: 99
+      memory: "96Mi"
+    requests:
+      cpu: 0.01
+      memory: "32Mi"
+  oxConnector:
+    limits:
+      cpu: 99
+      memory: "512Mi"
+    requests:
+      cpu: 0.1
+      memory: "64Mi"
  postfix:
    limits:
-      cpu: 0.5
-      memory: "250Mi"
+      cpu: 99
+      memory: "128Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "16Mi"
  postgresql:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  prosody:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "512Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
  redis:
    limits:
-      cpu: 1
-      memory: "500Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
  synapse:
    limits:
-      cpu: 4
+      cpu: 99
      memory: "4Gi"
    requests:
      cpu: 1
-      memory: "2Gi"
+      memory: "256Mi"
  synapseWeb:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "64Mi"
  univentionCorporateServer:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "4Gi"
    requests:
      cpu: 0.5
      memory: "1Gi"
  umsLdapNotifier:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsLdapServer:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsNotificationsApi:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsPortalFrontend:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsPortalListener:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsPortalListenerDependencies:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsPortalServer:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsStackDataUms:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsStackDataSwp:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsStoreDav:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsUdmRestApi:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsUmcGateway:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  umsUmcServer:
    limits:
-      cpu: 1
+      cpu: 99
      memory: "1Gi"
    requests:
      cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
  wellKnown:
    limits:
-      cpu: 1
-      memory: "250Mi"
+      cpu: 99
+      memory: "256Mi"
    requests:
      cpu: 0.1
-      memory: "50Mi"
+      memory: "32Mi"
  xwiki:
    limits:
-      cpu: 2
+      cpu: 99
      memory: "8Gi"
    requests:
      cpu: 0.1
-      memory: "6Gi"
+      memory: "1.5Gi"
 ...