From b1b4c28618e0eca31b59719e9e1f2db8ecff7f5c Mon Sep 17 00:00:00 2001 From: jconde Date: Thu, 15 Feb 2024 16:09:55 +0100 Subject: [PATCH] fix(univention-management-stack): UMS portal-server scalability --- docs/scaling.md | 73 ++++++++++--------- .../values-portal-frontend.yaml.gotmpl | 2 + .../values-portal-server.yaml.gotmpl | 2 + helmfile/environments/default/replicas.yaml | 2 + 4 files changed, 44 insertions(+), 35 deletions(-) diff --git a/docs/scaling.md b/docs/scaling.md index db041ef7..3439953b 100644 --- a/docs/scaling.md +++ b/docs/scaling.md @@ -20,38 +20,41 @@ Verified positive effects are marke with a check-mark in `Scaling (verified)` co marked with a gear. -| Component | Name | Scaling (effective) | Scaling (verified) | -|------------------|------------------------------------------|:-------------------:|:------------------:| -| ClamAV | `replicas.clamav` | :white_check_mark: | :white_check_mark: | -| | `replicas.clamd` | :white_check_mark: | :white_check_mark: | -| | `replicas.freshclam` | :x: | :x: | -| | `replicas.icap` | :white_check_mark: | :white_check_mark: | -| | `replicas.milter` | :white_check_mark: | :white_check_mark: | -| Collabora | `replicas.collabora` | :white_check_mark: | :gear: | -| CryptPad | `replicas.cryptpad` | :white_check_mark: | :gear: | -| Dovecot | `replicas.dovecot` | :x: | :gear: | -| Element | `replicas.element` | :white_check_mark: | :white_check_mark: | -| | `replicas.matrixNeoBoardWidget` | :white_check_mark: | :gear: | -| | `replicas.matrixNeoChoiceWidget` | :white_check_mark: | :gear: | -| | `replicas.matrixNeoDateFixBot` | :white_check_mark: | :gear: | -| | `replicas.matrixNeoDateFixWidget` | :white_check_mark: | :gear: | -| | `replicas.matrixUserVerificationService` | :white_check_mark: | :gear: | -| | `replicas.synapse` | :x: | :gear: | -| | `replicas.synapseWeb` | :white_check_mark: | :white_check_mark: | -| | `replicas.wellKnown` | :white_check_mark: | :white_check_mark: | -| Intercom Service | `replicas.intercomService` | :white_check_mark: | :gear: | -| Jitsi | `replicas.jibri` | :white_check_mark: | :gear: | -| | `replicas.jicofo` | :white_check_mark: | :gear: | -| | `replicas.jitsi ` | :white_check_mark: | :gear: | -| | `replicas.jitsiKeycloakAdapter` | :white_check_mark: | :gear: | -| | `replicas.jvb ` | :x: | :x: | -| Keycloak | `replicas.keycloak` | :white_check_mark: | :gear: | -| Memcached | `replicas.memcached` | :gear: | :gear: | -| Minio | `replicas.minioDistributed` | :white_check_mark: | :white_check_mark: | -| Nextcloud | `replicas.nextcloudApache2` | :white_check_mark: | :white_check_mark: | -| | `replicas.nextcloudExporter` | :white_check_mark: | :white_check_mark: | -| | `replicas.nextcloudPHP` | :white_check_mark: | :white_check_mark: | -| OpenProject | `replicas.openproject` | :white_check_mark: | :white_check_mark: | -| Postfix | `replicas.postfix` | :x: | :gear: | -| Redis | `replicas.redis` | :gear: | :gear: | -| XWiki | `replicas.xwiki` | :x: | :gear: | +| Component | Name | Scaling (effective) | Scaling (verified) | +|-----------------------------|------------------------------------------|:-------------------:|:------------------:| +| ClamAV | `replicas.clamav` | :white_check_mark: | :white_check_mark: | +| | `replicas.clamd` | :white_check_mark: | :white_check_mark: | +| | `replicas.freshclam` | :x: | :x: | +| | `replicas.icap` | :white_check_mark: | :white_check_mark: | +| | `replicas.milter` | :white_check_mark: | :white_check_mark: | +| Collabora | `replicas.collabora` | :white_check_mark: | :gear: | +| CryptPad | `replicas.cryptpad` | :white_check_mark: | :gear: | +| Dovecot | `replicas.dovecot` | :x: | :gear: | +| Element | `replicas.element` | :white_check_mark: | :white_check_mark: | +| | `replicas.matrixNeoBoardWidget` | :white_check_mark: | :gear: | +| | `replicas.matrixNeoChoiceWidget` | :white_check_mark: | :gear: | +| | `replicas.matrixNeoDateFixBot` | :white_check_mark: | :gear: | +| | `replicas.matrixNeoDateFixWidget` | :white_check_mark: | :gear: | +| | `replicas.matrixUserVerificationService` | :white_check_mark: | :gear: | +| | `replicas.synapse` | :x: | :gear: | +| | `replicas.synapseWeb` | :white_check_mark: | :white_check_mark: | +| | `replicas.wellKnown` | :white_check_mark: | :white_check_mark: | +| Intercom Service | `replicas.intercomService` | :white_check_mark: | :gear: | +| Jitsi | `replicas.jibri` | :white_check_mark: | :gear: | +| | `replicas.jicofo` | :white_check_mark: | :gear: | +| | `replicas.jitsi ` | :white_check_mark: | :gear: | +| | `replicas.jitsiKeycloakAdapter` | :white_check_mark: | :gear: | +| | `replicas.jvb ` | :x: | :x: | +| Keycloak | `replicas.keycloak` | :white_check_mark: | :gear: | +| Memcached | `replicas.memcached` | :gear: | :gear: | +| Minio | `replicas.minioDistributed` | :white_check_mark: | :white_check_mark: | +| Nextcloud | `replicas.nextcloudApache2` | :white_check_mark: | :white_check_mark: | +| | `replicas.nextcloudExporter` | :white_check_mark: | :white_check_mark: | +| | `replicas.nextcloudPHP` | :white_check_mark: | :white_check_mark: | +| OpenProject | `replicas.openproject` | :white_check_mark: | :white_check_mark: | +| Postfix | `replicas.postfix` | :x: | :gear: | +| Redis | `replicas.redis` | :gear: | :gear: | +| Univention Management Stack | | :gear: | :gear: | +| | `replicas.umsPortalFrontend` | :white_check_mark: | :white_check_mark: | +| | `replicas.umsPortalServer` | :white_check_mark: | :white_check_mark: | +| XWiki | `replicas.xwiki` | :x: | :gear: | diff --git a/helmfile/apps/univention-management-stack/values-portal-frontend.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-portal-frontend.yaml.gotmpl index bbbc6b07..6146b405 100644 --- a/helmfile/apps/univention-management-stack/values-portal-frontend.yaml.gotmpl +++ b/helmfile/apps/univention-management-stack/values-portal-frontend.yaml.gotmpl @@ -83,6 +83,8 @@ image: path: "/univention/portal/custom/" tls: {} +replicaCount: {{ .Values.replicas.umsPortalFrontend }} + resources: {{ .Values.resources.umsPortalFrontend | toYaml | nindent 2 }} diff --git a/helmfile/apps/univention-management-stack/values-portal-server.yaml.gotmpl b/helmfile/apps/univention-management-stack/values-portal-server.yaml.gotmpl index f6e0e9e5..398086ed 100644 --- a/helmfile/apps/univention-management-stack/values-portal-server.yaml.gotmpl +++ b/helmfile/apps/univention-management-stack/values-portal-server.yaml.gotmpl @@ -27,6 +27,8 @@ portalServer: enabled: true authenticatorSecret: {{ .Values.secrets.centralnavigation.apiKey | quote }} +replicaCount: {{ .Values.replicas.umsPortalServer }} + resources: {{ .Values.resources.umsPortalServer | toYaml | nindent 2 }} diff --git a/helmfile/environments/default/replicas.yaml b/helmfile/environments/default/replicas.yaml index cd94719b..33eb0c30 100644 --- a/helmfile/environments/default/replicas.yaml +++ b/helmfile/environments/default/replicas.yaml @@ -38,6 +38,8 @@ replicas: redis: 1 synapse: 1 synapseWeb: 1 + umsPortalFrontend: 1 + umsPortalServer: 1 wellKnown: 1 xwiki: 1 ...