chore(release): 0.5.49 [skip ci]

## [0.5.49](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.48...v0.5.49) (2023-11-27)

### Bug Fixes

* **nextcloud:** Bump image to incorporate fix for https://github.com/nextcloud/security-advisories/security/advisories/GHSA-f962-hw26-g267 ([efbd814](efbd814968))

.gitlab-ci.yml

@@ -555,7 +555,7 @@ generate-release-assets:
       - "./build_artefacts/image-index.json"
   tags: []
   variables:
-    ASSET_GENERATOR_REPO_PATH: "bmi/souveraener_arbeitsplatz/tooling/opendesk-asset-generator"
+    ASSET_GENERATOR_REPO_PATH: "bmi/opendesk/tooling/opendesk-asset-generator"
 
 
 # Declare .environments which is in environments repository and only loaded when INCLUDE_ENVIRONMENTS_ENABLED not false.

CHANGELOG.md

@@ -1,3 +1,32 @@
+## [0.5.49](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.48...v0.5.49) (2023-11-27)
+
+
+### Bug Fixes
+
+* **nextcloud:** Bump image to incorporate fix for https://github.com/nextcloud/security-advisories/security/advisories/GHSA-f962-hw26-g267 ([efbd814](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/efbd81496868c5d4274f09805a1e771f47d548be))
+
+## [0.5.48](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.47...v0.5.48) (2023-11-24)
+
+
+### Bug Fixes
+
+* **services:** Update resource requests and remove cpu limits ([f86a74b](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/f86a74ba100c7f08f6538b58a713bbc87c00e814))
+
+## [0.5.47](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.46...v0.5.47) (2023-11-24)
+
+
+### Bug Fixes
+
+* **helmfile:** Rename absolute paths on OpenCoDE to new 'opendesk' base group name ([7ac2e0f](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/7ac2e0f9de2a8386a7f5809ba40db4ed7164a857))
+* **xwiki:** Enable the sync of user profile picture from LDAP ([6aa3d38](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/6aa3d386afe8b3f22e47f9971fd719089006b54e))
+
+## [0.5.46](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.45...v0.5.46) (2023-11-23)
+
+
+### Bug Fixes
+
+* **element:** Fix quotes in element chart ([a447c13](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/a447c137fe58be343e7ada55afb7f6891a5cde74))
+
 ## [0.5.45](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.44...v0.5.45) (2023-11-22)
 
 

CONTRIBUTING.md

@@ -5,7 +5,7 @@ SPDX-License-Identifier: Apache-2.0
 
 # Read me first
 
-Please read the [project's overall CONTRIBUTING.md](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/info/-/blob/main/CONTRIBUTING.md) first.
+Please read the [project's overall CONTRIBUTING.md](https://gitlab.opencode.de/bmi/opendesk/info/-/blob/main/CONTRIBUTING.md) first.
 
 # How to contribute?
 

README.md

@@ -40,7 +40,7 @@ Basic knowledge of Kubernetes and Devops is required though.
 
 # Active development notice
 openDesk will face breaking changes in the near future without upgrade paths before
-[technical release](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/-/releases
+[technical release](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/-/releases
 v1.0.0 is reached.
 
 While most components support upgrades, major configuration or component changes may occur, therefore we recommend
@@ -60,10 +60,10 @@ Of course, further development also includes enhancing the documentation.
 
 We love to get feedback from you!
 Related to the deployment / contents of this repository,
-please use the [issues within this project](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/-/issues).
+please use the [issues within this project](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/-/issues).
 
 If you want to address other topics, please check the section
-["Rückmeldungen und Beteiligung" of the Infos' project OVERVIEW.md](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/info/-/blob/main/OVERVIEW.md#rückmeldungen-und-beteiligung).
+["Rückmeldungen und Beteiligung" of the Infos' project OVERVIEW.md](https://gitlab.opencode.de/bmi/opendesk/info/-/blob/main/OVERVIEW.md#rückmeldungen-und-beteiligung).
 
 # Requirements
 
@@ -86,7 +86,7 @@ If you want to address other topics, please check the section
 All technical releases are created using [Semantic Versioning](https://semver.org/lang/de/).
 
 Gitlab provides an
-[overview on the releases](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/-/releases)
+[overview on the releases](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/-/releases)
 of this project.
 
 The following release artefacts are provided beside the default source code assets:

helmfile.yaml

@@ -29,7 +29,7 @@ missingFileHandler: "Error"
 # - Installing all releases from root via helmfile apply
 # - Installing a single release from root via helmfile apply -f helmfile/apps/<app>/helmfile.yaml
 # - Installing a single release from app directory via helmfile apply
-# Issue: https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/-/issues/2
+# Issue: https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/-/issues/2
 
 environments:
   default:

helmfile/apps/element/helmfile.yaml

@@ -33,7 +33,7 @@ repositories:
 releases:
   - name: "opendesk-element"
     chart: "opendesk-element-repo/opendesk-element"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-element.yaml"
       - "values-element.gotmpl"
@@ -42,7 +42,7 @@ releases:
 
   - name: "opendesk-well-known"
     chart: "opendesk-element-repo/opendesk-well-known"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-well-known.yaml"
       - "values-well-known.gotmpl"
@@ -51,7 +51,7 @@ releases:
 
   - name: "opendesk-synapse-web"
     chart: "opendesk-element-repo/opendesk-synapse-web"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-synapse-web.yaml"
       - "values-synapse-web.gotmpl"
@@ -60,7 +60,7 @@ releases:
 
   - name: "opendesk-synapse"
     chart: "opendesk-element-repo/opendesk-synapse"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-synapse.yaml"
       - "values-synapse.gotmpl"
@@ -69,7 +69,7 @@ releases:
 
   - name: "opendesk-matrix-user-verification-service-bootstrap"
     chart: "opendesk-element-repo/opendesk-synapse-create-account"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-matrix-user-verification-service-bootstrap.yaml"
       - "values-matrix-user-verification-service-bootstrap.gotmpl"
@@ -78,7 +78,7 @@ releases:
 
   - name: "opendesk-matrix-user-verification-service"
     chart: "opendesk-element-repo/opendesk-matrix-user-verification-service"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-matrix-user-verification-service.yaml"
       - "values-matrix-user-verification-service.gotmpl"
@@ -114,7 +114,7 @@ releases:
 
   - name: "matrix-neodatefix-bot-bootstrap"
     chart: "opendesk-element-repo/opendesk-synapse-create-account"
-    version: "2.5.0"
+    version: "2.5.1"
     values:
       - "values-matrix-neodatefix-bot-bootstrap.yaml"
       - "values-matrix-neodatefix-bot-bootstrap.gotmpl"

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 }}
 ...

helmfile/apps/keycloak/helmfile.yaml

@@ -16,7 +16,7 @@ repositories:
     verify: true
     keyring: "../../files/gpg-pubkeys/souvap-univention-de.gpg"
   # openDesk Keycloak Theme
-  # Source: https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/components/charts/opendesk-keycloak-theme
+  # Source: https://gitlab.opencode.de/bmi/opendesk/components/charts/opendesk-keycloak-theme
   - name: "keycloak-theme-repo"
     oci: true
     url: >-

helmfile/apps/nextcloud/helmfile.yaml

@@ -8,7 +8,7 @@ bases:
 repositories:
   # openDesk Keycloak Bootstrap
   # Source:
-  #  https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/components/charts/sovereign-workplace-nextcloud-bootstrap
+  #  https://gitlab.opencode.de/bmi/opendesk/components/charts/sovereign-workplace-nextcloud-bootstrap
   - name: "opendesk-nextcloud-bootstrap-repo"
     oci: true
     # yamllint disable rule:line-length

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 }}

helmfile/apps/open-xchange/helmfile.yaml

@@ -7,7 +7,7 @@ bases:
 ---
 repositories:
   # openDesk Dovecot
-  # Source: https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/components/charts/opendesk-dovecot
+  # Source: https://gitlab.opencode.de/bmi/opendesk/components/charts/opendesk-dovecot
   - name: "opendesk-dovecot-repo"
     oci: true
     url: >-
@@ -21,7 +21,7 @@ repositories:
     url: >-
       {{ env "PRIVATE_IMAGE_REGISTRY_URL" | default "registry.open-xchange.com" }}
   # openDesk Open-Xchange Bootstrap
-  # Source: https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/components/charts/opendesk-open-xchange-bootstrap
+  # Source: https://gitlab.opencode.de/bmi/opendesk/components/charts/opendesk-open-xchange-bootstrap
   - name: "opendesk-open-xchange-bootstrap-repo"
     oci: true
     # yamllint disable rule:line-length
@@ -35,7 +35,7 @@ repositories:
 releases:
   - name: "dovecot"
     chart: "opendesk-dovecot-repo/dovecot"
-    version: "1.3.5"
+    version: "1.3.6"
     values:
       - "values-dovecot.yaml"
       - "values-dovecot.gotmpl"

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 }}
 ...

helmfile/apps/xwiki/values.gotmpl

@@ -16,7 +16,7 @@ externalDB:
 
 customConfigs:
   "xwiki.cfg":
-    "xwiki.superadminpassword": {{ .Values.secrets.xwiki.superadminpassword | quote }}
+    xwiki.superadminpassword: {{ .Values.secrets.xwiki.superadminpassword | quote }}
     ## LDAP Server configuration
     xwiki.authentication.ldap.server: {{ .Values.ldap.host | quote }}
     xwiki.authentication.ldap.port: 389
@@ -25,6 +25,8 @@ customConfigs:
     xwiki.authentication.ldap.bind_pass: {{ .Values.secrets.univentionCorporateServer.ldapSearch.xwiki | quote }}
     ## Base DN used for searching for users
     xwiki.authentication.ldap.base_DN: "dc=swp-ldap,dc=internal"
+    ## Allow short update cycles of the LDAP group cache
+    xwiki.authentication.ldap.groupcache_expiration: 300
 
   "xwiki.properties":
     "oidc.endpoint.authorization": "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/souvap/protocol/openid-connect/auth"

helmfile/apps/xwiki/values.yaml

@@ -10,9 +10,9 @@ customConfigs:
     ## Indicate the LDAP field defining the user UID
     xwiki.authentication.ldap.UID_attr: "uid"
     ## Indicate the LDAP field defining the user profile picture
-    # xwiki.authentication.ldap.photo_attribute: "jpegPhoto"
+    xwiki.authentication.ldap.photo_attribute: "jpegPhoto"
     ## Enable the synchronization of the LDAP profile picture
-    # xwiki.authentication.ldap.update_photo: 1
+    xwiki.authentication.ldap.update_photo: 1
 
   xwiki.properties:
     oidc.scope: "openid,profile,email,address,phoenix"
@@ -80,8 +80,10 @@ properties:
   "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchDN":
     "dc=swp-ldap,dc=internal"
   ## LDAP filter to only synchronize some groups
+  # "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter":
+  #   "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))"
   "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter":
-    "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))"
+    "(objectClass=opendeskKnowledgemanagementGroup)"
 
 securityContext:
   enabled: true

helmfile/environments/default/images.yaml

@@ -118,7 +118,7 @@ images:
     # @supplier: "openDesk DevSecOps"
   nextcloud:
     repository: "nextcloud"
-    tag: "27.1.1-apache@sha256:47325758ffcd54563021e697905aaba6aac8c21bceefb245c67d40194813ce39"
+    tag: "27.1.3-apache@sha256:ec46e99164ee7fa5d49e84784833e022be47f9f54f401bcb5a2d789f8c0bc149"
     # @supplier: "Nextcloud Community"
   nextcloudExporter:
     repository: "xperimental/nextcloud-exporter"

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
+      cpu: 99
-      memory: "250Mi"
+      memory: "256Mi"
     requests:
       cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
   element:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "250Mi"
+      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
+      cpu: 99
-      memory: "500Mi"
+      memory: "768Mi"
     requests:
       cpu: 0.1
-      memory: "125Mi"
+      memory: "384Mi"
   jicofo:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      memory: "512Mi"
     requests:
       cpu: 0.1
-      memory: "100Mi"
+      memory: "256Mi"
   jitsi:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      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
+      cpu: 99
-      memory: "500Mi"
+      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
+      cpu: 99
-      memory: "500Mi"
+      memory: "256Mi"
     requests:
       cpu: 0.1
-      memory: "100Mi"
+      memory: "48Mi"
   keycloakBootstrap:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      memory: "512Mi"
     requests:
       cpu: 0.1
-      memory: "250Mi"
+      memory: "256Mi"
   keycloakProxy:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      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
+      cpu: 99
-      memory: "250Mi"
+      memory: "128Mi"
     requests:
       cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
   matrixNeoChoiceWidget:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "250Mi"
+      memory: "256Mi"
     requests:
       cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
   matrixNeoDateFixBot:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      memory: "512Mi"
     requests:
       cpu: 0.1
-      memory: "100Mi"
+      memory: "128Mi"
   matrixNeoDateFixWidget:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "250Mi"
+      memory: "256Mi"
     requests:
       cpu: 0.1
-      memory: "50Mi"
+      memory: "48Mi"
   matrixUserVerificationService:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "250Mi"
+      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
+      cpu: 99
-      memory: "4Gi"
+      memory: "96Mi"
     requests:
       cpu: 0.1
-      memory: "2Gi"
+      memory: "16Mi"
   minio:
     limits:
-      cpu: 2
+      cpu: 99
-      memory: "4Gi"
+      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"
+      memory: "768Mi"
-  oxConnector:
+  openxchangeCoreDocumentConverter:
     limits:
-      cpu: 2
+      cpu: 99
-      memory: "2Gi"
-    requests:
-      cpu: 0.1
-      memory: "250Mi"
-  oxDocumentConverter:
-    limits:
-      cpu: 2
       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
+      cpu: 99
-      memory: "250Mi"
+      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
+      cpu: 99
-      memory: "500Mi"
+      memory: "512Mi"
     requests:
       cpu: 0.1
-      memory: "100Mi"
+      memory: "32Mi"
   redis:
     limits:
-      cpu: 1
+      cpu: 99
-      memory: "500Mi"
+      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
+      cpu: 99
-      memory: "250Mi"
+      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
+      cpu: 99
-      memory: "250Mi"
+      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"
 ...