sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 15:31:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Dominik Kaminski
2023-11-21 21:49:00 +01:00
parent 71d11cfcd0
commit f86a74ba10
4 changed files with 247 additions and 126 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
helmfile/apps/intercom-service/values.gotmpl
View File

@@ -46,4 +46,7 @@ ingress:
tls: tls:
enabled: {{ .Values.ingress.tls.enabled }} enabled: {{ .Values.ingress.tls.enabled }}
secretName: {{ .Values.ingress.tls.secretName | quote }} secretName: {{ .Values.ingress.tls.secretName | quote }}
resources:
{{ .Values.resources.intercomService | toYaml | nindent 2 }}
... ...

2
helmfile/apps/nextcloud/values-nextcloud.gotmpl
View File

@@ -49,6 +49,8 @@ metrics:
enabled: {{ .Values.prometheus.serviceMonitors.enabled }} enabled: {{ .Values.prometheus.serviceMonitors.enabled }}
labels: labels:
{{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 6 }} {{- toYaml .Values.prometheus.serviceMonitors.labels | nindent 6 }}
resources:
{{ .Values.resources.nextcloudMetrics | toYaml | nindent 4 }}
{{- if .Values.cluster.persistence.readWriteMany.enabled }} {{- if .Values.cluster.persistence.readWriteMany.enabled }}
replicaCount: {{ .Values.replicas.nextcloud }} replicaCount: {{ .Values.replicas.nextcloud }}

25
helmfile/apps/open-xchange/values-openxchange.gotmpl
View File

@@ -25,6 +25,8 @@ nextcloud-integration-ui:
{{- range .Values.global.imagePullSecrets }} {{- range .Values.global.imagePullSecrets }}
- name: {{ . | quote }} - name: {{ . | quote }}
{{- end }} {{- end }}
resources:
{{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
public-sector-ui: public-sector-ui:
image: image:
@@ -35,6 +37,8 @@ public-sector-ui:
- name: {{ . | quote }} - name: {{ . | quote }}
{{- end }} {{- end }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
resources:
{{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
appsuite: appsuite:
istio: istio:
@@ -62,6 +66,8 @@ appsuite:
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGotenberg.repository }}" repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGotenberg.repository }}"
tag: {{ .Values.images.openxchangeGotenberg.tag | quote }} tag: {{ .Values.images.openxchangeGotenberg.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
resources:
{{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
properties: 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.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" "com.openexchange.oauth.provider.allowedIssuer": "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap"
@@ -119,6 +125,8 @@ appsuite:
{{- range .Values.global.imagePullSecrets }} {{- range .Values.global.imagePullSecrets }}
- name: {{ . | quote }} - name: {{ . | quote }}
{{- end }} {{- end }}
resources:
{{ .Values.resources.openxchangeCoreMW | toYaml | nindent 6 }}
core-ui: core-ui:
imagePullSecrets: imagePullSecrets:
@@ -129,6 +137,8 @@ appsuite:
repository: {{ .Values.images.openxchangeCoreUI.repository | quote }} repository: {{ .Values.images.openxchangeCoreUI.repository | quote }}
tag: {{ .Values.images.openxchangeCoreUI.tag | quote }} tag: {{ .Values.images.openxchangeCoreUI.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
resources:
{{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
core-ui-middleware: core-ui-middleware:
ingress: ingress:
@@ -146,13 +156,18 @@ appsuite:
redis: redis:
auth: auth:
password: {{ .Values.secrets.redis.password | quote }} password: {{ .Values.secrets.redis.password | quote }}
resources:
{{ .Values.resources.openxchangeCoreUIMiddleware | toYaml | nindent 6 }}
updater:
resources:
{{ .Values.resources.openxchangeCoreUIMiddlewareUpdater | toYaml | nindent 6 }}
core-documentconverter: core-documentconverter:
image: image:
repository: {{ .Values.images.openxchangeDocumentConverter.repository | quote }} repository: {{ .Values.images.openxchangeDocumentConverter.repository | quote }}
tag: {{ .Values.images.openxchangeDocumentConverter.tag | quote }} tag: {{ .Values.images.openxchangeDocumentConverter.tag | quote }}
resources: resources:
{{- .Values.resources.oxDocumentConverter | toYaml | nindent 6 }} {{- .Values.resources.openxchangeCoreDocumentConverter | toYaml | nindent 6 }}
core-guidedtours: core-guidedtours:
imagePullSecrets: imagePullSecrets:
@@ -163,11 +178,15 @@ appsuite:
repository: {{ .Values.images.openxchangeCoreGuidedtours.repository | quote }} repository: {{ .Values.images.openxchangeCoreGuidedtours.repository | quote }}
tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }} tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
resources:
{{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
core-imageconverter: core-imageconverter:
image: image:
repository: {{ .Values.images.openxchangeImageConverter.repository | quote }} repository: {{ .Values.images.openxchangeImageConverter.repository | quote }}
tag: {{ .Values.images.openxchangeImageConverter.tag | quote }} tag: {{ .Values.images.openxchangeImageConverter.tag | quote }}
resources:
{{- .Values.resources.openxchangeCoreImageConverter | toYaml | nindent 6 }}
guard-ui: guard-ui:
imagePullSecrets: imagePullSecrets:
@@ -178,6 +197,8 @@ appsuite:
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGuardUI.repository }}" repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.openxchangeGuardUI.repository }}"
tag: {{ .Values.images.openxchangeGuardUI.tag | quote }} tag: {{ .Values.images.openxchangeGuardUI.tag | quote }}
pullPolicy: {{ .Values.global.imagePullPolicy | quote }} pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
resources:
{{- .Values.resources.openxchangeGuardUI | toYaml | nindent 6 }}
core-user-guide: core-user-guide:
image: image:
@@ -188,4 +209,6 @@ appsuite:
{{- range .Values.global.imagePullSecrets }} {{- range .Values.global.imagePullSecrets }}
- name: {{ . | quote }} - name: {{ . | quote }}
{{- end }} {{- end }}
resources:
{{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}
... ...

343
helmfile/environments/default/resources.yaml
View File

@@ -1,362 +1,455 @@
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
# SPDX-License-Identifier: Apache-2.0 # 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: resources:
clamd: clamd:
limits: limits:
cpu: 4 cpu: 99
memory: "4Gi" memory: "4Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "2Gi" memory: "1.5Gi"
collabora: collabora:
limits: limits:
cpu: 4 cpu: 99
memory: "4Gi" memory: "4Gi"
requests: requests:
cpu: 0.5 cpu: 0.5
memory: "1Gi" memory: "512Mi"
cryptpad: cryptpad:
limits: limits:
cpu: 2 cpu: 99
memory: "2Gi" memory: "2Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "512Mi" memory: "512Mi"
dovecot: dovecot:
limits: limits:
cpu: 0.5 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "32Mi"
element: element:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "32Mi"
freshclam: freshclam:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "96Mi"
icap: icap:
limits: limits:
cpu: 2 cpu: 99
memory: "128Mi" memory: "128Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "16Mi" memory: "16Mi"
intercomService:
limits:
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "64Mi"
jibri: jibri:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "768Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "125Mi" memory: "384Mi"
jicofo: jicofo:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "512Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "256Mi"
jitsi: jitsi:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "512Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "32Mi"
jitsiKeycloakAdapter: jitsiKeycloakAdapter:
limits: limits:
cpu: "100m" cpu: 99
memory: "128Mi" memory: "128Mi"
requests: requests:
cpu: "10m" cpu: "10m"
memory: "16Mi" memory: "48Mi"
jvb: jvb:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "768Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "384Mi"
keycloak: keycloak:
limits: limits:
cpu: 2 cpu: 99
memory: "2Gi" memory: "2Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "750Mi" memory: "512Mi"
keycloakExtension: keycloakExtension:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "48Mi"
keycloakBootstrap: keycloakBootstrap:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "512Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
keycloakProxy: keycloakProxy:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "48Mi"
mariadb: mariadb:
limits: limits:
cpu: 2 cpu: 99
memory: "2Gi" memory: "2Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "500Mi" memory: "384Mi"
matrixNeoBoardWidget: matrixNeoBoardWidget:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "128Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "48Mi"
matrixNeoChoiceWidget: matrixNeoChoiceWidget:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "48Mi"
matrixNeoDateFixBot: matrixNeoDateFixBot:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "512Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "128Mi"
matrixNeoDateFixWidget: matrixNeoDateFixWidget:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "48Mi"
matrixUserVerificationService: matrixUserVerificationService:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "128Mi"
memcached: memcached:
limits: limits:
cpu: 1 cpu: 99
memory: "256Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "32Mi" memory: "32Mi"
milter: milter:
limits: limits:
cpu: 4 cpu: 99
memory: "4Gi" memory: "96Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "2Gi" memory: "16Mi"
minio: minio:
limits: limits:
cpu: 2 cpu: 99
memory: "4Gi" memory: "2Gi"
requests: requests:
cpu: 0.25 cpu: 0.25
memory: "1Gi" memory: "256Mi"
nextcloud: nextcloud:
limits: limits:
cpu: 2 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "500Mi" memory: "512Mi"
nextcloudMetrics:
limits:
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "32Mi"
openproject: openproject:
limits: limits:
cpu: 2 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "768Mi"
oxConnector: openxchangeCoreDocumentConverter:
limits: limits:
cpu: 2 cpu: 99
memory: "2Gi"
requests:
cpu: 0.1
memory: "250Mi"
oxDocumentConverter:
limits:
cpu: 2
memory: "2Gi" memory: "2Gi"
requests: requests:
cpu: 0.25 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: postfix:
limits: limits:
cpu: 0.5 cpu: 99
memory: "250Mi" memory: "128Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "16Mi"
postgresql: postgresql:
limits: limits:
cpu: 2 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
prosody: prosody:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "512Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "32Mi"
redis: redis:
limits: limits:
cpu: 1 cpu: 99
memory: "500Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "100Mi" memory: "32Mi"
synapse: synapse:
limits: limits:
cpu: 4 cpu: 99
memory: "4Gi" memory: "4Gi"
requests: requests:
cpu: 1 cpu: 1
memory: "2Gi" memory: "256Mi"
synapseWeb: synapseWeb:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "64Mi"
univentionCorporateServer: univentionCorporateServer:
limits: limits:
cpu: 2 cpu: 99
memory: "4Gi" memory: "4Gi"
requests: requests:
cpu: 0.5 cpu: 0.5
memory: "1Gi" memory: "1Gi"
umsLdapNotifier: umsLdapNotifier:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsLdapServer: umsLdapServer:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsNotificationsApi: umsNotificationsApi:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsPortalFrontend: umsPortalFrontend:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsPortalListener: umsPortalListener:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsPortalListenerDependencies: umsPortalListenerDependencies:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsPortalServer: umsPortalServer:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsStackDataUms: umsStackDataUms:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsStackDataSwp: umsStackDataSwp:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsStoreDav: umsStoreDav:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsUdmRestApi: umsUdmRestApi:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsUmcGateway: umsUmcGateway:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
umsUmcServer: umsUmcServer:
limits: limits:
cpu: 1 cpu: 99
memory: "1Gi" memory: "1Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "250Mi" memory: "256Mi"
wellKnown: wellKnown:
limits: limits:
cpu: 1 cpu: 99
memory: "250Mi" memory: "256Mi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "50Mi" memory: "32Mi"
xwiki: xwiki:
limits: limits:
cpu: 2 cpu: 99
memory: "8Gi" memory: "8Gi"
requests: requests:
cpu: 0.1 cpu: 0.1
memory: "6Gi" memory: "1.5Gi"
... ...