wip:

## [1.3.2](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.3.1...v1.3.2) (2025-05-06)

### Bug Fixes

* **dovecot:** Update Helm chart to fix migration mode ([7ba84b9](7ba84b99ca))
* **helmfile:** Explicitly template auth-modules in OX App Suite; Streamline name of OX App Suite EE image ([6cbb6b6](6cbb6b6922))

.gitlab-ci.yml

@@ -232,8 +232,8 @@ variables:
   extends: ".environments"
   environment:
     name: "${NAMESPACE}"
-  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:1.1.0\
+  image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/helm:1.3.1\
-          @sha256:74f349066ac5d20e3afaa6abd28781b4c8dc086f67e3d3c1b8345e4a9c3371b1"
+          @sha256:de527f493044f06009045c369be831ababbc8dd74adaa378613c5acb1e654959"
   script:
     - "cd ${CI_PROJECT_DIR}/helmfile/apps/${COMPONENT}"
     # MASTER_PASSWORD_WEB_VAR as precedence for MASTER_PASSWORD
@@ -769,6 +769,17 @@ avscan-prepare:
         stage: "scan"
         image: "registry.opencode.de/bmi/opendesk/components/platform-development/images/clamav-imagescan:1.0.0"
         before_script:
+          - "mkdir -p ~/.docker"
+          - |
+            cat << EOF > ~/.docker/config.json
+            {
+              "auths": {
+                "$CI_REGISTRY": {
+                  "auth": "$(printf %s:%s ${CI_REGISTRY_USER} ${CI_REGISTRY_PASSWORD} | base64 | tr -d '\n')"
+                }
+              }
+            }
+            EOF
           - "sed -i \"/^DatabaseMirror .*$/c DatabaseMirror ${DATABASE_MIRROR}\" /etc/clamav/freshclam.conf"
           - "freshclam"
           - "mkdir /scan"

CHANGELOG.md

@@ -1,3 +1,44 @@
+## [1.3.2](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.3.1...v1.3.2) (2025-05-06)
+
+
+### Bug Fixes
+
+* **dovecot:** Update Helm chart to fix migration mode ([7ba84b9](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7ba84b99caf61e5a4a35b71d875e9ede0f71423e))
+* **helmfile:** Explicitly template auth-modules in OX App Suite; Streamline name of OX App Suite EE image ([6cbb6b6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6cbb6b6922864467ca365bcc9b1cfa49182df050))
+
+## [1.3.1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.3.0...v1.3.1) (2025-04-24)
+
+
+### Bug Fixes
+
+* **ci:** Update Helm to v3.17.3 ([9446faa](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9446faaa597777e9fb15d33953e02fdbfef646b2))
+* **ci:** Update Helm to v3.17.3 ([d794a20](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/d794a2036ed6543bf89a0b661cc8a4c8a383a5f0))
+* **docs:** Update "Ingress controller" section and add footnote on volume provisioner in `requirements.md` ([17efbd7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/17efbd79f177f635885735823696a6e50b919d3e))
+* **helmfile:** Conditional templating of additional annotations in selected components to unblock openDesk deployment despite a bug in Helm 3.17 (https://github.com/helm/helm/issues/30587) ([861b84b](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/861b84b14de9fb42c483f3ddb9e083305750d137))
+* **postfix:** Disable unauthenticated relaying of mails in `postfix-ox` ([7414f05](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7414f05005e019f2121e8458fe63e795819fe92c))
+
+# [1.3.0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.2.1...v1.3.0) (2025-04-22)
+
+
+### Bug Fixes
+
+* **helmfile:** Fix Kyverno lint issues for EE components ([46b3834](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/46b38342d3cb6789e1734cd6eba412bc726c834b))
+* **helmfile:** Remove no longer used `secrets.nubus.defaultAccounts.*` ([6e6d155](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/6e6d15552e87a77870755db3b48f2af686916c1f))
+* **helmfile:** Support for Keycloak session settings via `functional.authentication.realmSettings.*` ([3fcfa00](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/3fcfa00503854f752a3885321b16b3f3597cb09a))
+* **migrations:** Optional delete of `ums-minio-rewrites` Ingress, as it is non-existing in deployments with external object storage ([6932953](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/693295391bb02892b537a48513c9e0c2824ed466))
+* **ox-connector:** Update to v0.19.0 ([fe664a7](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/fe664a7f8d696fea53b6abadec5a0cb5db751f43))
+* **xwiki:** Update Helm chart to v1.4.4 to fix the problem with XWiki not starting when secrets contained specific (XML interpreted) characters ([67a1df0](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/67a1df0f80dc598287174a8dd6bda3f477227f0d))
+
+
+### Features
+
+* **collabora:** Update to 24.04.13 ([8f12208](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/8f12208074b2947ec65ebc3c21920d4f775e0c6e))
+* **helmfile:** Add template support for annotations ([9cde57d](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/9cde57d74b8cfdd09e4f6b82cf45f1b1a686e035))
+* **helmfile:** Support for SSO federation; see `ssoFederation` section in `functional.yaml.gotmpl` for details ([79975a5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/79975a58e3a4f50e59d1d790045c22a32ab49372))
+* **nubus:** Show openDesk version to all users (instead of admin users only) ([393ee31](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/393ee311630630fd1aae8354ead90bcaaf5e4dba))
+* **nubus:** Update to 1.8.0 ([90c49f6](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/90c49f6f83df0b34b86c17164eaa4e137d0cd9be))
+* **openproject:** Update to 15.5.0 ([7f1cfc5](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/commit/7f1cfc55551f608603e0401dfef24bbb9cc334e5))
+
 ## [1.2.1](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/compare/v1.2.0...v1.2.1) (2025-03-28)
 
 

README-EE.md

@@ -123,7 +123,7 @@ When a repository path starts with `/zendis`, the artifact is only available in
 - Collabora Online (COOL) container image: Is build from the same public source code as Collabora Development Edition (CODE), only the build configurations might differ. COOL includes a brand package that is not public and its license is not open source.
 - COOL Controller container image and Helm chart: Source code and chart are using Mozilla Public License Version 2.0, but the source code is not public. It is provided to customers upon request.
 
-openDesk updates Collabora once a COOL image based on the version pattern `<major>.<minor>.<patch>.3` is available, at the same time the CODE image will be updated to `<major>.<minor>.<patch>.2`.
+openDesk updates Collabora once a COOL image based on the version pattern `<major>.<minor>.<patch>.3+.<build>` was made available. This happens usually at the same time the CODE image with `<major>.<minor>.<patch>.2+.<build>` is made available.
 
 ### Element
 

README.md

@@ -40,10 +40,10 @@ openDesk currently features the following functional main components:
 | File management      | Nextcloud                   | [30.0.6](https://nextcloud.com/de/changelog/#30-0-6)                                                                          | [Nextcloud 30](https://docs.nextcloud.com/)                                                                                           |
 | Groupware            | OX App Suite                | [8.35](https://documentation.open-xchange.com/appsuite/releases/8.35/)                                                        | Online documentation available from within the installed application; [Additional resources](https://documentation.open-xchange.com/) |
 | Knowledge management | XWiki                       | [16.10.5](https://www.xwiki.org/xwiki/bin/view/ReleaseNotes/Data/XWiki/16.10.5/)                                              | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation)                                                     |
-| Portal & IAM         | Nubus                       | [1.7.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/latest/en/changelog.html#version-1-7-0-2025-02-23) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
+| Portal & IAM         | Nubus                       | [1.8.0](https://docs.software-univention.de/nubus-kubernetes-release-notes/latest/en/changelog.html#version-1-8-0-2025-04-07) | [Univention's documentation website](https://docs.software-univention.de/n/en/nubus.html)                                             |
-| Project management   | OpenProject                 | [15.4.2](https://www.openproject.org/docs/release-notes/15-4-2/)                                                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
+| Project management   | OpenProject                 | [15.5.0](https://www.openproject.org/docs/release-notes/15-5-0/)                                                              | [For the most recent release](https://www.openproject.org/docs/user-guide/)                                                           |
 | Videoconferencing    | Jitsi                       | [2.0.9955](https://github.com/jitsi/jitsi-meet/releases/tag/stable%2Fjitsi-meet_9955)                                         | [For the most recent  release](https://jitsi.github.io/handbook/docs/category/user-guide/)                                            |
-| Weboffice            | Collabora                   | [24.04.12.4](https://www.collaboraoffice.com/code-24-04-release-notes/)                                                       | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
+| Weboffice            | Collabora                   | [24.04.13](https://www.collaboraoffice.com/code-24-04-release-notes/)                                                         | Online documentation available from within the installed application; [Additional resources](https://sdk.collaboraonline.com/)        |
 
 While not all components are perfectly designed for the execution inside containers, one of the project's objectives is to
 align the applications with best practices regarding container design and operations.

docs/baseline-requirements.md

@@ -119,7 +119,7 @@ openDesk should be compliant with the "Deutsche Verwaltungscloud Strategie" (DVS
 
 ## IT-Grundschutz
 
-The IT-Grundschutz catalog knowns a lot of modules ("Bausteine"), but not all of them apply to all components, as there are some related to hardware or some just relevant for the operator while openDesk is "just" the software platform. The first step for an IT-Grundschutz evaluation of a component (or the platform as a whole) requires defining which modules are applicable. Other modules apply to all components e.g. [APP.4.4 Kubernetes](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/06_APP_Anwendungen/APP_4_4_Kubernetes_Edition_2023.pdf), [SYS.1.6 Containerisierung](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/07_SYS_IT_Systeme/SYS_1_6_Containerisierung_Edition_2023.pdf) and [CON 2 Datenschutz](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/03_CON_Konzepte_und_Vorgehensweisen/CON_2_Datenschutz_Edition_2023.pdf).
+The IT-Grundschutz catalog knowns a lot of modules ("Bausteine"), but not all of them apply to all components, as there are some related to hardware or some just relevant for the operator while openDesk is "just" the software platform. The first step for an IT-Grundschutz evaluation of a component (or the platform as a whole) requires defining which modules are applicable. Other modules apply to all components e.g. [APP.4.4 Kubernetes](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/06_APP_Anwendungen/APP_4_4_Kubernetes_Edition_2023.pdf), [SYS.1.6 Containerisierung](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/07_SYS_IT_Systeme/SYS_1_6_Containerisierung_Edition_2023.pdf) and [CON.2 Datenschutz](https://www.bsi.bund.de/SharedDocs/Downloads/DE/BSI/Grundschutz/IT-GS-Kompendium_Einzel_PDFs_2023/03_CON_Konzepte_und_Vorgehensweisen/CON_2_Datenschutz_Edition_2023.pdf).
 
 Within each module are multiple requirements ("Anforderungen") that are usually composed of multiple partial requirements ("Teilanforderungen"). Each requirement has a given category:
 - B for basic ("Basis") - the requirement must be fulfilled.
@@ -133,7 +133,7 @@ Different requirements address different roles in IT-Grundschutz.
 - Operator: processes & product (service)
 - Customer: processes.
 
-As a supplier of an openDesk component, you will focus on the "Supplier" requirements, while the outcome (your product) must enable the Provider to fulfill the requirements that lay with its responsibility for the openDesk platform. Operators use openDesk to provide a service, therefore the openDesk platform must enable an Operator to fulfill the related requirements. Finally, the service must enable the customer to align with the scope of the IT Grundschutz catalog. So it will happen that a requirement from e.g. the customer level needs a specific capability by the product (Supplier's responsibility), a defined core configuration from the platform (Provider's responsibility), or a certain service setup from the Operator.
+As a supplier of an openDesk component, you will focus on the "Supplier" requirements, while the outcome (your product) must enable the Provider to fulfill the requirements that lay with its responsibility for the openDesk platform. Operators use openDesk to provide a service, therefore the openDesk platform must enable an Operator to fulfill the related requirements. Finally, the service must enable the customer to align with the scope of the IT-Grundschutz catalog. So it will happen that a requirement from e.g. the customer level needs a specific capability by the product (Supplier's responsibility), a defined core configuration from the platform (Provider's responsibility), or a certain service setup from the Operator.
 
 We are aware that IT-Grundschutz is a complex topic and are working towards a streamlined process to reduce overhead as much as possible and ensure to maximize the use of synergies.
 
@@ -167,7 +167,7 @@ Each component must be able to operate according to the [EU's General Data Prote
 
 While this can be answered by each component that will be in the spotlight for the suppliers, we also need an aligned overall picture for openDesk that at least has the platform-specific user lifecycle and cross-application interfaces in focus.
 
-Note: The topics of availability, integrity, and confidentiality of personal data are also being addressed by the IT-Grundschutz module "CON 2". It has to be ensured that it is not in contradiction to what is being done in the general area of data protection.
+Note: The topics of availability, integrity, and confidentiality of personal data are also being addressed by the IT-Grundschutz module "CON.2". It has to be ensured that it is not in contradiction to what is being done in the general area of data protection.
 
 **Reference:** https://gitlab.opencode.de/bmi/opendesk/documentation/datenschutz
 
@@ -185,7 +185,8 @@ With a central Identity- and Access Management (IAM) also the user lifecycle (UL
 
 The focus is to have all the account information in all applications including the account's state, profile picture ([reference](https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk/-/issues/27)) and - where required - the user's group memberships. This cannot be done purely by pushing that data through OIDC claims when a user logs in to an application therefore two ways of managing an account are applicable and described in the following subchapters.
 
-Note: Allowing ad hoc updates of account data through OIDC claims during login is still encouraged.
+> **Note**<br>
+> Allowing ad hoc updates of account data through OIDC claims during login is still encouraged.
 
 ### Pull: LDAP
 

docs/development.md

@@ -159,4 +159,3 @@ for Helm charts.
 You may also want to make use of our [standard CI](https://gitlab.opencode.de/bmi/opendesk/tooling/gitlab-config) to
 quickly get Helm charts and container images that are signed, linted, scanned, and released.
 Check out the `.gitlab-ci.yaml` files in the project's [Charts](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts) or [Images](https://gitlab.opencode.de/bmi/opendesk/components/platform-development/images) to get an idea just how little you need to do by yourself.
-components

docs/enhanced-configuration/groupware-migration.md

@@ -17,6 +17,8 @@ SPDX-License-Identifier: Apache-2.0
     * [Add multiple user accounts via CSV file](#add-multiple-user-accounts-via-csv-file)
   * [Start the migration](#start-the-migration)
   * [Monitor migration status](#monitor-migration-status)
+* [Appendix](#appendix)
+  * [Validating master authentication](#validating-master-authentication)
 <!-- TOC -->
 
 Most organizations already have email accounts on various platforms that need to be migrated to openDesk. This document describes the migration from M365 accounts to openDesk using the [audriga Migration Service](https://www.audriga.com) in combination with the master authentication option in openDesk. Other source platforms are also supported, and their migrations work in a similar manner.
@@ -70,7 +72,7 @@ In openDesk, you have to have all user accounts with mailboxes pre-defined befor
 
 ## Deploy openDesk with master authentication
 
-With openDesk 1.0 Enterprise, you can set openDesk's email components (OX AppSuite and OX Dovecot) to master authentication mode to run the migration as described in this document using the following two settings for your deployment:
+With openDesk 1.0 Enterprise, you can set openDesk's email components (OX AppSuite and OX Dovecot) to master authentication mode to run the migration as described in this document using the following two settings for your deployment. This is NOT available in openDesk Community deployments:
 
 ```
 secrets:
@@ -85,10 +87,12 @@ functional:
 1. You must specify a master password, it will be referenced later in this document.
 2. You need to enable the actual master authentication mode.
 
+To validate the master authentication mode please read the appendix section at the end of the document.
+
 Updating your deployment with these settings will allow you to continue with the migration scenario. Once the migration is completed, you can remove `secrets.oxAppSuite.adminPassword` and need to turn off the migration mode by setting `functional.migration.oxAppSuite.enabled` to `false` or removing that setting, as `false` is the default before you update your deployment once again.
 
 > **Note**<br>
-> For the changes to take effect, it is sufficient to re-deploy the `open-xchange` component alone.
+> For the changes to take effect, it is sufficient to re-deploy the `open-xchange` component alone. But you have to restart the Dovecot Pod(s) manually when switching to/from the master authentication mode for the changes to take effect.
 
 > **Note**<br>
 > While in master authentication mode, regular users cannot log in to the webmail module of openDesk or access the mail using IMAP, as it is not recommended that users interact with the target mail infrastructure during the migration scenario described in this document.
@@ -182,3 +186,39 @@ Click on "Details" to get further information about the migration.
 You can access a detailed log for each account by clicking "Protocol" on the right-hand side. Here, you can see detected duplicates or encountered errors (e.g., if emails cannot be transferred due to your provider's size limitations).
 
 You will receive status emails for the migration job's submission and start, as well as when the migration job is finished. The emails are sent to the email address you have entered during the configuration. Those emails include a link to the status website so you can easily track and monitor your migration. Once the migration has been started, you can safely close the status website and shut down your computer; the migration will continue. You can re-open the status website anytime.
+
+# Appendix
+
+## Validating master authentication
+
+Below are details in case you want to verify master authentication for Dovecot and OX AppSuite.
+
+Set a few variables first:
+
+```shell
+export MIG_DOMAIN=your-opendesk-domain.tld
+export MIG_WEBMAIL_HOST=webmail
+export MIG_USERNAME=eva
+export MIG_MASTER_PASSWORD=YourMasterPassword
+export MIG_IMAP_PORT=31123
+```
+
+Ensure that you have defined a (your) default context for the migration where the account (in this example `eva`) can be found. The following should be executed in OX App Suite's `open-xchange-core-mw-default-0` container, in the example we set the default context to `1`:
+
+```shell
+/opt/open-xchange/sbin/changecontext -c 1 -L defaultcontext -A $MASTER_ADMIN_USER -P $MASTER_ADMIN_PW
+```
+
+With the preparation from above you should be able to successfully authenticate to both components:
+
+**OX App Suite**
+
+```shell
+curl -X POST -d "name=${MIG_USERNAME}&password=${MIG_MASTER_PASSWORD}" "https://${MIG_WEBMAIL_HOST}.${MIG_DOMAIN}/appsuite/api/login?action=login"
+```
+
+**Dovecot**
+
+```shell
+echo "a001 LOGIN ${MIG_USERNAME} ${MIG_MASTER_PASSWORD}" | openssl s_client -ign_eof -connect ${MIG_DOMAIN}:${MIG_IMAP_PORT}
+```

docs/enhanced-configuration/idp-federation.md

@@ -82,8 +82,8 @@ The following values are used in this example documentation. Please ensure when
 - `id.opendesk.tld`: hostname for the openDesk IdP, so openDesk is deployed at `opendesk.tld`.
 - `fed-test-idp-realm`: realm name for your organization's IdP.
 - `opendesk-federation-client`: OIDC client for the openDesk federation defined in your organization's IdP.
-- `auto-federate-idp`: Identifier of your organization IdP's configuration within the openDesk Keycloak.
+- `sso-federation-idp`: Identifier of your organization IdP's configuration within the openDesk Keycloak.
-- `auto-federate-flow`: Identifier of the required additional login flow to be created and referenced in the openDesk Keycloak.
+- `sso-federation-flow`: Identifier of the required additional login flow to be created and referenced in the openDesk Keycloak.
 
 ## Keycloak admin console access
 
@@ -125,7 +125,7 @@ If you just created the `fed-test-idp-realm`, you are already in the admin scree
       - `Standard flow`
       - `Direct access grants`
   - Client create wizard page 3:
-    - *Valid Redirect URLs*: `https://id.opendesk.tld/realms/opendesk/broker/auto-federate-idp/endpoint`
+    - *Valid Redirect URLs*: `https://id.opendesk.tld/realms/opendesk/broker/sso-federation-idp/endpoint`
   - When completed with *Save*, you get to the detailed client configuration that also needs some updates:
     - Tab *Settings* > Section *Logout settings*
       - *Front channel logout*: `Off`
@@ -135,17 +135,21 @@ If you just created the `fed-test-idp-realm`, you are already in the admin scree
 
 ## openDesk IdP
 
+> **Note**
+> While manual configuration is possible, an SSO federation can also be configured as part of the deployment.
+> Check `functional.authentication.ssoFederation` section from the `functional.yaml.gotmpl` for details.
+
 The following configuration is taking place in the Keycloak realm `opendesk`.
 
 - *Authentication* > *Create flow*
-  - *Name*: `auto-federate-flow`
+  - *Name*: `sso-federation-flow`
   - *Flow type*: `Basic flow`
   - *Create*
   - *Add execution*: Add `Detect existing broker user` and set it to `Required`
   - *Add step*: `Automatically set existing user` and set it to `Required`
 
 - *Identity providers* > *User-defined* > *OpenID Connect 1.0*
-  - *Alias*: `auto-federate-idp` (used in our example)
+  - *Alias*: `sso-federation-idp` (used in our example)
   - *Display Name*: A descriptive Name, in case you do not forcefully redirect the user to the IdP, that name is shown on the login screen for manual selection.
   - *Use discovery endpoint*: `On` (default)
   - *Discovery endpoint*: `https://idp.organization.tld/realms/fed-test-idp-realm/.well-known/openid-configuration` - this URL may look different if you do not use Keycloak or a different Keycloak version as IdP in your organization
@@ -155,11 +159,11 @@ The following configuration is taking place in the Keycloak realm `opendesk`.
   - *Client ID*: Use the client ID you took from your organization's IdP config (`opendesk-federation-client` in this example)
   - *Client Secret*: Use the secret you took from your organization's IdP config
   - When completed with *Add*, you get to the detailed IdP configuration which at least needs the following update:
-    - *First login flow override*: `auto-federate-flow`
+    - *First login flow override*: `sso-federation-flow`
     - Depending on your organizations IdP and process preferences, additional configuration may be required
 
 - In case you want to forcefully redirect all users to your organization's IdP (disabling login with local openDesk accounts):
   - *Authentication* > `2fa-browser`
     - Click on the cogwheel next to the *Identity Provider Re-director*
-      - *Alias*: `auto-federate-idp`
+      - *Alias*: `sso-federation-idp`
-      - *Default Identity Provider*: `auto-federate-idp`
+      - *Default Identity Provider*: `sso-federation-idp`

docs/getting-started.md

@@ -73,7 +73,7 @@ For your convenience, we recommend creating a `*.domain.tld` A-Record for your c
 
 ## Domain
 
-A list of all subdomains can be found in `helmfile/environments/default/global.gotmpl`.
+A list of all subdomains can be found in `helmfile/environments/default/global.yaml.gotmpl`.
 
 All subdomains can be customized. For example, _Nextcloud_ can be changed to `files.domain.tld` in `dev` environment:
 
@@ -99,7 +99,7 @@ export DOMAIN=domain.tld
 ### Apps
 
 Depending on your ideal openDesk deployment, you may wish to disable or enable certain apps.
-All available apps and their default values are located in `helmfile/environments/default/opendesk_main.gotmpl`.
+All available apps and their default values are located in `helmfile/environments/default/opendesk_main.yaml.gotmpl`.
 
 | Component            | Name                        | Default | Description                    |
 | -------------------- | --------------------------- | ------- | ------------------------------ |
@@ -231,7 +231,7 @@ ingress:
 ```
 
 Currently, the only supported ingress controller is `ingress-nginx` (see
-[requirements.md](./docs/requirements.md)) for reference).
+[requirements.md](./docs/requirements.md) for reference).
 
 ### Container runtime
 
@@ -272,7 +272,8 @@ While openDesk configures the applications with meaningful defaults, you can che
 
 ### Ports
 
-**Note:** If you use `NodePort` for service exposure, you must check your deployment for the actual ports and ensure they are opened where necessary.
+> **Note**<br>
+> If you use `NodePort` for service exposure, you must check your deployment for the actual ports and ensure they are opened where necessary.
 
 #### Web-based user interface
 

docs/migrations.md

@@ -1,5 +1,5 @@
 <!--
-SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-License-Identifier: Apache-2.0
 -->
 
@@ -10,6 +10,7 @@ SPDX-License-Identifier: Apache-2.0
 * [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
 * [Manual checks/actions](#manual-checksactions)
   * [From v1.1.2](#from-v112)
+    * [Pre-upgrade from v1.1.2](#pre-upgrade-from-v112)
       * [Helmfile cleanup: Do not configure OX provisioning when no OX installed](#helmfile-cleanup-do-not-configure-ox-provisioning-when-no-ox-installed)
       * [Helmfile new default: PostgreSQL for XWiki and Nextcloud](#helmfile-new-default-postgresql-for-xwiki-and-nextcloud)
   * [From v1.1.1](#from-v111)
@@ -83,7 +84,7 @@ To upgrade existing deployments, you cannot skip any version mentioned in the co
 
 | Mandatory version |
 | ----------------- |
-| v1.2.x            |
+| v1.2+             |
 | v1.1.x            |
 | v1.0.0            |
 | v0.9.0            |
@@ -100,6 +101,8 @@ Be sure you check all the sections for the releases you are going to update your
 
 ## From v1.1.2
 
+### Pre-upgrade from v1.1.2
+
 #### Helmfile cleanup: Do not configure OX provisioning when no OX installed
 
 **Target group:** Installations that have no OX App Suite installed.

docs/requirements.md

@@ -1,4 +1,5 @@
 <!--
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 SPDX-License-Identifier: Apache-2.0
 -->
@@ -12,6 +13,8 @@ This section covers the internal system requirements and external service requir
 * [Hardware](#hardware)
 * [Kubernetes](#kubernetes)
 * [Ingress controller](#ingress-controller)
+  * [Supported controllers](#supported-controllers)
+  * [Minimal configuration](#minimal-configuration)
 * [Volume provisioner](#volume-provisioner)
 * [Certificate management](#certificate-management)
 * [External services](#external-services)
@@ -25,15 +28,13 @@ openDesk is a Kubernetes-only solution and requires an existing Kubernetes (K8s)
 
 - K8s cluster >= v1.24, [CNCF Certified Kubernetes distribution](https://www.cncf.io/certification/software-conformance/)
 - Domain and DNS Service
-- Ingress controller (Ingress NGINX) >= [4.11.5/1.11.5](https://github.com/kubernetes/ingress-nginx/releases) - tested with v1.11.1 up to v1.11.5
+- Ingress controller (Ingress NGINX) >= [4.11.5/1.11.5](https://github.com/kubernetes/ingress-nginx/releases)
-  - **Important Note**: We are working on support for more recent versions, but please ensure to use at least 1.11.5 due to ["security issues"](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in earlier versions.
-  - Ingress-NGINX introduced new security defaults in version 1.12.0, which are currently not compatible with openDesk. While we are working to adhere to these defaults, you can find additional information below on how to configure Ingress-NGINX >= 1.12.0 to be compatible with openDesk.
 - [Helm](https://helm.sh/) >= v3.9.0
-- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= **v1.0.0-rc8**
+- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= v1.0.0-rc8
 - [HelmDiff](https://github.com/databus23/helm-diff) >= v3.6.0
-- Volume provisioner supporting RWO (read-write-once)
+- Volume provisioner supporting RWO (read-write-once)[^1]
 - Certificate handling with [cert-manager](https://cert-manager.io/)
-- [OpenKruise](https://openkruise.io/)[^1] >= v1.6
+- [OpenKruise](https://openkruise.io/)[^2] >= v1.6
 
 # Hardware
 
@@ -60,21 +61,33 @@ The deployment is tested against [kubespray](https://github.com/kubernetes-sigs/
 The deployment is intended to be used only over HTTPS via a configured FQDN, therefore it is required to have a properly
 configured ingress controller deployed in your cluster.
 
-**Supported controllers:**
+## Supported controllers
+
 - [Ingress NGINX Controller](https://github.com/kubernetes/ingress-nginx)
 
+> **Note**<br>
+> The platform development team is evaluating the use of [Gateway API](https://gateway-api.sigs.k8s.io/).
+
 **Compatibility with Ingress NGINX >= 1.12.0**
 
-With the release 1.12.0 Ingress NGINX introduced new security default settings, which are incompatible with current openDesk releases. If you want to use Ingress-NGINX >= 1.12.0 the following settings have to be set
+With the release 1.12.0 Ingress NGINX introduced new security default settings, which are incompatible with current openDesk releases. If you want to use Ingress-NGINX >= 1.12.0 the following settings have to be set:
-- The annotation risk level has to be set to `critical`. See the [documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#annotations-risk-level) for details.
+```
-- Strict path type validation has to be disabled. See the [documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#strict-validate-path-type) for details.
+controller.config.annotations-risk-level=Critical
+controller.config.strict-validate-path-type=false
+```
+See the [`annotations-risk-level` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#annotations-risk-level) and [`strict-validate-path-type` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#strict-validate-path-type) for details.
 
 > **Important Note**<br>
-> Ensure to install at least Ingress NGINX 1.12.1 due to ["security issues"](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in 1.12.0.
+> Ensure to install at least Ingress NGINX 1.11.5 or 1.12.1 due to [security issues](https://www.wiz.io/blog/ingress-nginx-kubernetes-vulnerabilities) in earlier versions.
 
+## Minimal configuration
 
-> **Note**<br>
+Several components in openDesk make use of snippet annotations, which are disabled by default. Please enable them using the following configuration:
-> The platform development team is evaluating the use of [Gateway API](https://gateway-api.sigs.k8s.io/). If you can provide input on that topic, please get in contact with us.
+```
+controller.allowSnippetAnnotations=true
+controller.admissionWebhooks.allowSnippetAnnotations=true
+```
+See the [`allowSnippetAnnotations` documentation](https://kubernetes.github.io/ingress-nginx/user-guide/nginx-configuration/configmap/#allow-snippet-annotations) for context.
 
 # Volume provisioner
 
@@ -122,4 +135,6 @@ Helmfile requires [HelmDiff](https://github.com/databus23/helm-diff) to compare
 
 # Footnotes
 
-[^1]: Required for Dovecot Pro as part of openDesk Enterprise Edition.
+[^1]: Due to [restrictions on Kubernetes `emptyDir`](https://github.com/kubernetes/kubernetes/pull/130277) you need a volume provisioner that has sticky bit support, otherwise the OpenProject seeder job will fail.
+
+[^2]: Required for Dovecot Pro as part of openDesk Enterprise Edition.

docs/scaling.md

@@ -1,23 +1,39 @@
 <!--
+SPDX-FileCopyrightText: 2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
 SPDX-License-Identifier: Apache-2.0
 -->
 
 <h1>Scaling</h1>
 
-This document covers the possibilities to scale applications.
+This document covers the possibilities to scale the applications in openDesk.
 
-# Horizontal scalability
+It provides rough benchmarks for configuring your own environment across various scale levels.
+In production, resource demands are primarily driven by actual usage patterns and system load, especially the number of concurrently active users.
+Consequently, we strongly recommend implementing monitoring and logging solutions to detect usage trends and enable timely intervention when needed.
 
-We are working on generating this document automatically based on the file
+| Application  | Recommendation | Note(s) |
-[`replicas.yaml.gotmpl`](../helmfile/environments/default/replicas.yaml.gotmpl) that contains necessary annotations.
+| ------------ | -------------- | ------- |
-In the meantime, this file can be used to check the components scaling support/capabilities.
+| Collabora    | - 1 vCPU per 15 active users <br/> - 50 MB RAM per active user <br/> - 1 MBit/s per 10 active users | - |
+| Element      | Per 10k users with values for federation enabled / federation switched off:<br/><br/> Homeserver:<br/> - 15 / 10 vCPU<br/> - 12 / 8 GB RAM<br/><br/>Postgres:<br/> - 10 / 4 vCPU<br/> - 16 / 32 GB RAM | Required hardware resources are impacted by whether or not federation is being used |
+| Cryptpad     | No large-scale deployments seen, minimum requirements: <br/> - 2 vCPU <br/> - 2 GB RAM <br/> - 20 GB storage (depending on planned usage) | Most of the computation is done client-side |
+| Jitsi        | Jitsi-Meet server: <br/> - 4 vCPU <br/> - 8 GB RAM <br/> <br/> For every 200 concurrent users one JVB with: <br/> - 8 vCPU <br/> - 8 GB RAM <br/><br/> Network bandwidth: <br/> - 1 GBit/s - 10 GBit/s small deployments <br/> - 10 Gbit/s *per bridge* large deployments<br/> | JVB network bandwidth calculation depends on the stream resolution (HD vs. 4k). |
+| Nextcloud    | Up to 5k / more than 5k users: <br/> - 4 to 20 Nextcloud AIO Pods with 8 vCPUs and 32 / 64 GB RAM each <br/> - 2 / 4 DB servers with 8 / 16 vCPUs and 64 / 128 GB RAM each, plus DB load balancer | - |
+| OpenProject  | - 4-6 vCPU per ~500 users <br/> - 6-8 GB per ~500 users <br/> - +20-50 GB storage per ~500 users, depending on workload and attachment storage[^1] <br/><br/> - Web Workers: +4 per ~500 users <br/> - Background Workers: +1-2 multithreaded workers per ~500 users, depending on workload | These values are guidelines and should be adjusted based on actual monitoring of resource usage. Scaling should prioritize CPU and RAM, prioritize scaling Web Workers first, followed by Background Workers and Disk Space as needed. |
+| Open-Xchange | For ~200 users (64 concurrent users to App Suite & 128 users to Dovecot): <br/> - 10 vCPU <br/> - 58 GB RAM <br/> - 660 GB storage | - |
+| XWiki        | Advise for small instances: <br> - 4 vCPU <br/> - 6 GB RAM | - |
+
+[^1]: Nextcloud is configured for attachment storage as well.
 
 # Upstream information
 
 While scaling services horizontally is the ideal solution, information about vertical scaling is helpful
 when defining the application's resources, see [`resources.yaml.gotmpl`](../helmfile/environments/default/resources.yaml.gotmpl) for references.
 
-Linked below is documentation related to scaling from the upstream application:
+Linked below is documentation related to scaling for upstream applications, where publically available:
 
-- [OpenProject system requirements](https://www.openproject.org/docs/installation-and-operations/system-requirements/)
+- [Collabora Online Technical Documentation](https://mautic.collaboraoffice.com/asset/60:collabora-online-technical-information-pdf)
+- [OpenProject System Requirements](https://www.openproject.org/docs/installation-and-operations/system-requirements/)
+- [XWiki Performance](https://www.xwiki.org/xwiki/bin/view/Documentation/AdminGuide/Performances/)
+- [Element Requirements and Recommendations](https://ems-docs.element.io/books/element-server-suite-documentation-lts-2404/page/requirements-and-recommendations)
+- [Jitsi DevOps Guide (scalable setup)](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-scalable/), [Jitsi Meet Needs](https://jitsi.github.io/handbook/docs/devops-guide/devops-guide-requirements/)

docs/security-context.md

@@ -100,6 +100,7 @@ containerSecurityContext:
     type: "RuntimeDefault"
 ```
 
+
 or
 
 ```yaml
@@ -111,7 +112,7 @@ containerSecurityContext:
 ## readOnlyRootFilesystem
 
 
-Containers should have immutable file systems, so that attackers can not modify application code or download malicious code.
+Containers should have an immutable file systems, so that attackers can not modify application code or download malicious code.
 
 ```yaml
 containerSecurityContext:
@@ -146,7 +147,7 @@ This list gives you an overview of templated security settings and if they compl
 
 | process | status | allowPrivilegeEscalation | privileged | readOnlyRootFilesystem | runAsNonRoot | runAsUser | runAsGroup | seccompProfile | capabilities |
 | ------- | ------ | ------------------------ | ---------- | ---------------------- | ------------ | --------- | ---------- | -------------- | ------------ |
-| **collabora**/collabora-online | :x: | yes | no | no | yes | 100 | 101 | yes | no ["CHOWN","FOWNER","SYS_CHROOT"] |
+| **collabora**/collabora-online | :x: | yes | no | no | yes | 1001 | 1001 | yes | no ["CHOWN","FOWNER","SYS_CHROOT"] |
 | **cryptpad**/cryptpad | :x: | no | no | no | yes | 4001 | 4001 | yes | yes |
 | **element**/matrix-neoboard-widget | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |
 | **element**/matrix-neochoice-widget | :white_check_mark: | no | no | yes | yes | 101 | 101 | yes | yes |

docs/testing.md

@@ -9,14 +9,14 @@ SPDX-License-Identifier: Apache-2.0
 * [Overview](#overview)
 * [Test concept](#test-concept)
   * [Rely on upstream applications QA](#rely-on-upstream-applications-qa)
-  * [Run minimal functional QA (end-to-end tests)](#run-minimal-functional-qa-end-to-end-tests)
+  * [Functional QA (end-to-end tests)](#functional-qa-end-to-end-tests)
-  * [Run extensive load and performance tests](#run-extensive-load-and-performance-tests)
+    * [Nightly testing](#nightly-testing)
+    * [Reporting test results](#reporting-test-results)
+  * [Load- and performance testing](#load--and-performance-testing)
     * [Base performance testing](#base-performance-testing)
     * [Load testing to saturation point](#load-testing-to-saturation-point)
     * [Load testing up to a defined user count](#load-testing-up-to-a-defined-user-count)
     * [Overload/recovery tests](#overloadrecovery-tests)
-* [Reporting and test results](#reporting-and-test-results)
-  * [Allure TestOps](#allure-testops)
 <!-- TOC -->
 
 # Overview
@@ -42,24 +42,65 @@ We receive the release notes early before a new application release is integrate
 we are able to check for the existence of a sufficient set of test cases.
 The suppliers create a set of test cases for each new function.
 
-## Run minimal functional QA (end-to-end tests)
+## Functional QA (end-to-end tests)
 
-To ensure the function of all applications, we run a minimal set of testcases to check the
+We develop and maintain a [set of end-to-end tests](https://gitlab.opencode.de/bmi/opendesk/deployment/e2e-tests) focussing on:
-basic functionality of openDesk along with the integrated applications.
 
-Furthermore, we analyze all features and use cases which are implemented by a set of more than one
+- use cases that are spanning more than a single application, e.g.
-application.
+  - the filepicker in OX App Suite for selecting files from Nextcloud or
-Not all of these features are testable by the suppliers, so we develop testcases
+  - the central navigation that is part of the top bar of most applications.
-for such features.
+- openDesk specific configurations/supported settings that can be found in the `functional.yaml.gotmpl`, e.g.
+  - SSO federation or
+  - sharing settings for Nextcloud.
+- bugs identified in the past, e.g.
+  - creating a folder in OX or
+  - enforcement of an account's password renewal.
 
-The openDesk application owners prioritize this list of end-to-end-testcases, and we
+We execute the tests using English and German as language profile.
-implement these testcases in the [test automation framework](https://gitlab.opencode.de/bmi/opendesk/deployment/e2e-tests).
 
-## Run extensive load and performance tests
+The development team utilizes the test automation described above for QA'ing their feature branches.
+
+### Nightly testing
+
+We use the functional e2e-tests in nightly testruns on a matrix of deployments addressing different application profiles to ensure the quality of the development branch's current state.
+
+The following naming scheme is applied for the deployment matrix:
+
+- `<edition>-<type>-<profile>` resulting e.g. in  `ce-init-default` or `ee-upgr-extsrv`
+
+**`<edition>`**
+
+- `ce`: openDesk Community Edition
+- `ee`: openDesk Enterprise Edition
+
+**`<type>`**
+
+- `init`: Initial / fresh / from the scratch deployment of `develop` branch into an empty namespace.
+- `upgr`: Deploy latest migration release (needs to be pinned manually) into an empty namespace, afterwards run upgrade deployment with current state of `develop` branch.
+- `upd`: Deploy latest release (`main` branch) into an empty namespace, afterwards run upgrade deployment with current state of `develop` branch.
+
+**`<profile>`**: The following profiles are defined
+- `default`: With
+  - *`functional.yaml`*: No changes beside specific `2FA testing` group and enabled UDM REST API (required for user import).
+  - *Services*: Internal services deployed with openDesk are used.
+  - *Secrets*: Master password based secrets based on `secrets.yaml.gotmpl`
+  - *Certificates*: Letsencrypt-prod certificates are used.
+  - *Deployment*: GitLab CI based deployment.
+- `funct1`: Different configuration of `functional.yaml`, self-signed-certs [and when available external secrets].
+- `extsrv`: External services (where possible).
+- `gitops`: Argo CD based deployment.
+
+### Reporting test results
+
+All executions of the end-to-end tests are tracked in a central platform running [Allure TestOps](https://docs.qameta.io/allure-testops/).
+
+As the TestOps tool contains infrastructure details of our development and test clusters it is currently only accessible for to project members.
+
+## Load- and performance testing
 
 Our goal is to deliver openDesk as application-grade software with the ability to serve large user bases.
 
-We create and perform extensive load and performance tests for each release of openDesk.
+We create and perform [load- and performance tests](https://gitlab.opencode.de/bmi/opendesk/deployment/load-tests) for each release of openDesk.
 
 Our approach consists of different layers of load testing.
 
@@ -109,30 +150,4 @@ If necessary, we perform overload tests, which will saturate the system with mul
 test cases until no further increase in throughput is visible. Then we add even more load
 until the first HTTP requests run into timeouts or errors.
 After a few minutes, we reduce the load below the saturation point.
-Then we check if the system is able to recover from the overload status.
+Now we can check if the system is able to recover from the overload status.
-
-# Reporting and test results
-
-We perform test runs every night, on all of our environments.
-
-For each environment, we define so-called profiles, these contain the features enabled
-per environment.
-
-For example: Testing the email features in an environment without deployment of Open-Xchange makes no sense at all.
-
-Also, we test the whole system via a browser with `language=DE` and another browser with `language=EN`.
-
-The test results are saved in an [Allure TestOps](https://qameta.io/) server, so interested persons
-are able to view the test results later in detail.
-
-## Allure TestOps
-
-The Allure TestOps [server](https://testops.opendesk.run/) is currently only accessible to project members.
-
-The relevant project is called *opendesk*.
-
-To get an overview, click in the left symbol list onto the symbol "Rocket" to
-check all relevant launches.
-
-Now you can see the launch #xxxx, and directly check for the success
-of this launch.

docs/theming.md

@@ -14,7 +14,7 @@ This document covers the theming options for an openDesk deployment.
 
 # Settings
 
-All default settings can be found in [`theme.gotmpl`](../helmfile/environments/default/theme.gotmpl). Most of the components adhere to these settings.
+All default settings can be found in [`theme.yaml.gotmpl`](../helmfile/environments/default/theme.yaml.gotmpl). Most of the components adhere to these settings.
 
 Please review the default configuration that is applied to understand your customization options.
 

docs/workflow.md

@@ -374,7 +374,7 @@ Example: `fix(open-xchange): Bump to 8.26 to heal issue with functional mailbox
 
 #### Verified commits
 
-We only allow verified commits; please read about the options you have to make your commits verified:
+We only allow verified commits; please read on about the options you have to make your commits verified:
 - https://docs.gitlab.com/user/project/repository/signed_commits/ssh/
 - https://docs.gitlab.com/user/project/repository/signed_commits/gpg/
 - https://docs.gitlab.com/user/project/repository/signed_commits/x509/

helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl

@@ -33,6 +33,8 @@ imagePullSecrets:
 
 ingress:
   enabled: {{ .Values.ingress.enabled }}
+  annotations:
+    {{ .Values.annotations.coco.ingress | toYaml | nindent 4 }}
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:
     - host: "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
@@ -44,7 +46,8 @@ ingress:
       hosts:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.coco.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -65,4 +68,7 @@ replicaCount: {{ .Values.replicas.collaboraController }}
 resources:
   {{ .Values.resources.collaboraController | toYaml | nindent 2 }}
 
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.coco.serviceAccount | toYaml | nindent 4 }}
 ...

helmfile/apps/collabora/values.yaml.gotmpl

@@ -65,6 +65,35 @@ ingress:
       location /cool/getMetrics { deny all; return 403; }
       location /cool/adminws/ { deny all; return 403; }
       location /browser/dist/admin/admin.html { deny all; return 403; }
+    # NGINX
+    nginx.org/websocket-services: "collabora"
+    nginx.org/lb-method: "hash $arg_WOPISrc consistent"
+    nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
+    nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
+    nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.collabora }}"
+    nginx.org/server-snippets: |
+      # block admin and metrics endpoint from outside by default
+      location /cool/getMetrics { deny all; return 403; }
+      location /cool/adminws/ { deny all; return 403; }
+      location /browser/dist/admin/admin.html { deny all; return 403; }
+    # HAProxy
+    haproxy.org/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
+    haproxy.org/backend-config-snippet: |
+       balance url_param WOPISrc check_post
+       hash-type consistent
+    # HAProxy - Community: https://haproxy-ingress.github.io/
+    haproxy-ingress.github.io/timeout-tunnel: "{{ .Values.ingress.parameters.bodyTimeout.collabora }}s"
+    haproxy-ingress.github.io/balance-algorithm: "url_param WOPISrc check_post"
+    haproxy-ingress.github.io/config-backend: |
+      hash-type consistent
+      # block admin urls from outside
+      acl admin_url path_beg /cool/getMetrics
+      acl admin_url path_beg /cool/adminws/
+      acl admin_url path_beg /browser/dist/admin/admin.html
+      http-request deny if admin_url
+   {{- with .Values.annotations.collabora.ingress }}
+   {{ . | toYaml | nindent 4 }}
+   {{- end }}
   enabled: {{ .Values.ingress.enabled }}
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:
@@ -77,10 +106,11 @@ ingress:
       hosts:
         - "{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}"
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.collabora.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
-  fsGroup: 100
+  fsGroup: 1001
 
 prometheus:
   servicemonitor:
@@ -102,8 +132,8 @@ securityContext:
   privileged: false
   readOnlyRootFilesystem: false
   runAsNonRoot: true
-  runAsUser: 100
+  runAsUser: 1001
-  runAsGroup: 101
+  runAsGroup: 1001
   seccompProfile:
     type: "RuntimeDefault"
   capabilities:
@@ -116,6 +146,13 @@ securityContext:
 
   seLinuxOptions:
     {{ .Values.seLinuxOptions.collabora | toYaml | nindent 4 }}
+
 serviceAccount:
   create: true
+  annotations:
+    {{ .Values.annotations.collabora.serviceAccount | toYaml | nindent 4 }}
+
+service:
+  annotations:
+    {{ .Values.annotations.collabora.service | toYaml | nindent 4 }}
 ...

helmfile/apps/cryptpad/values.yaml.gotmpl

@@ -39,6 +39,9 @@ ingress:
   enabled: {{ .Values.ingress.enabled }}
   annotations:
     nginx.org/websocket-services: "cryptpad"
+   {{- with .Values.annotations.cryptpad.ingress }}
+   {{ . | toYaml | nindent 4 }}
+   {{- end }}
   className: {{ .Values.ingress.ingressClassName | quote }}
   hosts:
     - host: "{{ .Values.global.hosts.cryptpad }}.{{ .Values.global.domain }}"
@@ -53,7 +56,8 @@ ingress:
 persistence:
   enabled: false
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.cryptpad.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   fsGroup: 4001
@@ -80,6 +84,8 @@ securityContext:
 
 serviceAccount:
   create: true
+  annotations:
+    {{ .Values.annotations.cryptpad.serviceAccount | toYaml | nindent 4 }}
 
 workloadStateful: false
 

helmfile/apps/element/values-element.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.element.common | toYaml | nindent 2 }}
+
 configuration:
   endToEndEncryption: true
   additionalConfiguration:
@@ -136,8 +139,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.element.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.element.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -148,6 +154,14 @@ replicaCount: {{ .Values.replicas.element }}
 resources:
   {{ .Values.resources.element | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.element.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.element.serviceAccount | toYaml | nindent 4 }}
+
 theme:
   title: "Chat - {{ .Values.theme.texts.productName }}"
   {{ .Values.theme | toYaml | nindent 2 }}

helmfile/apps/element/values-matrix-neoboard-widget.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.elementMatrixNeoboardWidget.additional | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -39,8 +42,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.elementMatrixNeoboardWidget.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeoboardWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -51,6 +57,14 @@ replicaCount: {{ .Values.replicas.matrixNeoBoardWidget }}
 resources:
   {{ .Values.resources.matrixNeoBoardWidget | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeoboardWidget.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeoboardWidget.serviceAccount | toYaml | nindent 4 }}
+
 theme:
   {{ .Values.theme | toYaml | nindent 2 }}
 

helmfile/apps/element/values-matrix-neochoice-widget.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.elementMatrixNeochoiceWidget.additional | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -39,8 +42,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.elementMatrixNeochoiceWidget.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeochoiceWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -48,6 +54,14 @@ podSecurityContext:
 
 replicaCount: {{ .Values.replicas.matrixNeoChoiceWidget }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeochoiceWidget.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeochoiceWidget.serviceAccount | toYaml | nindent 4 }}
+
 theme:
   {{ .Values.theme | toYaml | nindent 2 }}
 

helmfile/apps/element/values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl

@@ -26,7 +26,8 @@ image:
 
 fullnameOverride: "matrix-neodatefix-bot-bootstrap"
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -43,4 +44,7 @@ securityContext:
   seLinuxOptions:
     {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
 
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixBotBootstrap.serviceAccount | toYaml | nindent 2 }}
+
 ...

helmfile/apps/element/values-matrix-neodatefix-bot.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixBot.additional | toYaml | nindent 2 }}
+
 global:
   domain: {{ .Values.global.domain | quote }}
   hosts:
@@ -76,6 +79,8 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixBot.ingress | toYaml | nindent 4 }}
 
 liveness sample:
   enabled: true
@@ -83,8 +88,11 @@ liveness sample:
 persistence:
   size: {{ .Values.persistence.storages.matrixNeoDateFixBot.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.matrixNeoDateFixBot.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixBot.persistence | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixBot.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -98,4 +106,12 @@ replicaCount: {{ .Values.replicas.matrixNeoDateFixBot }}
 resources:
   {{ .Values.resources.matrixNeoDateFixBot | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixBot.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixBot.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/element/values-matrix-neodatefix-widget.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixWidget.additional | toYaml | nindent 2 }}
+
 configuration:
   bot:
     username: "meetings-bot"
@@ -44,8 +47,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixWidget.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixNeodatefixWidget.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -59,6 +65,14 @@ resources:
 theme:
   {{ .Values.theme | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixWidget.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixNeodatefixWidget.serviceAccount | toYaml | nindent 4 }}
+
 nginx:
   ipv4Only: {{ if eq .Values.cluster.networking.ipFamilies "IPv4" }}true{{ else }}false{{ end }}
 

helmfile/apps/element/values-matrix-user-verification-service-bootstrap.yaml.gotmpl

@@ -26,7 +26,8 @@ image:
 
 fullnameOverride: "opendesk-matrix-user-verification-service-bootstrap"
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.pod | toYaml | nindent 2 }}
 
 securityContext:
   allowPrivilegeEscalation: false
@@ -42,4 +43,10 @@ securityContext:
     type: "RuntimeDefault"
   seLinuxOptions:
     {{ .Values.seLinuxOptions.synapseCreateUser | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixUserVerificationServiceBootstrap.serviceAccount | toYaml | nindent 4 }}
+
+
 ...

helmfile/apps/element/values-matrix-user-verification-service.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Federal Ministry of the Interior and Community, PG
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.elementMatrixUserVerificationService.additional | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -42,7 +45,8 @@ image:
   repository: {{ .Values.images.matrixUserVerificationService.repository | quote }}
   tag: {{ .Values.images.matrixUserVerificationService.tag | quote }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementMatrixUserVerificationService.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -53,4 +57,12 @@ replicaCount: {{ .Values.replicas.matrixUserVerificationService }}
 resources:
   {{ .Values.resources.matrixUserVerificationService | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementMatrixUserVerificationService.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementMatrixUserVerificationService.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/element/values-synapse-web.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.elementSynapseWeb.common | toYaml | nindent 2 }}
+
 clusterDomain: {{ .Values.cluster.networking.domain }}
 
 containerSecurityContext:
@@ -44,6 +47,9 @@ ingress:
     nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.element }}"
     nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.element }}s"
     nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.element }}s"
+    {{- with .Values.annotations.elementSynapseWeb.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   host: "{{ .Values.global.hosts.synapse }}.{{ .Values.global.domain }}"
   enabled: {{ .Values.ingress.enabled }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
@@ -51,7 +57,8 @@ ingress:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementSynapseWeb.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -62,4 +69,12 @@ replicaCount: {{ .Values.replicas.synapseWeb }}
 resources:
   {{ .Values.resources.synapseWeb | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementSynapseWeb.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementSynapseWeb.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/element/values-synapse.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.elementSynapse.common | toYaml | nindent 2 }}
+
 configuration:
   additionalConfiguration:
     user_directory:
@@ -217,6 +220,8 @@ federation:
     tls:
       enabled: {{ .Values.ingress.tls.enabled }}
       secretName: {{ .Values.ingress.tls.secretName | quote }}
+    annotations:
+      {{ .Values.annotations.elementSynapse.federationIngress | toYaml | nindent 6 }}
 
 global:
   domain: {{ .Values.global.domain | quote }}
@@ -234,8 +239,11 @@ image:
 persistence:
   size: {{ .Values.persistence.storages.synapse.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.synapse.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.elementSynapse.persistence | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementSynapse.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -250,6 +258,14 @@ replicaCount: {{ .Values.replicas.synapse }}
 resources:
   {{ .Values.resources.synapse | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementSynapse.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementSynapse.serviceAccount | toYaml | nindent 4 }}
+
 tls:
   secretName: {{ if .Values.global.matrixDomain }}"opendesk-certificates-synapse-tls"{{ else }}"opendesk-certificates-tls"{{ end }}
 ...

helmfile/apps/element/values-well-known.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.elementWellKnown.common | toYaml | nindent 2 }}
+
 configuration:
   e2ee:
     forceDisable: false
@@ -44,8 +47,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.elementWellKnown.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.elementWellKnown.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -56,4 +62,11 @@ replicaCount: {{ .Values.replicas.wellKnown }}
 resources:
   {{ .Values.resources.wellKnown | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.elementWellKnown.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.elementWellKnown.serviceAccount | toYaml | nindent 4 }}
 ...

helmfile/apps/jitsi/values-jitsi.yaml.gotmpl

@@ -10,8 +10,10 @@ global:
     {{ .Values.global.hosts | toYaml | nindent 4 }}
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
-  podAnnotations: {}
+  {{- if .Values.annotations.jitsiGlobal.pod }}
-
+  podAnnotations:
+    {{ .Values.annotations.jitsiGlobal.pod | toYaml | nindent 4}}
+  {{- end }}
 containerSecurityContext:
   allowPrivilegeEscalation: false
   enabled: true
@@ -77,6 +79,12 @@ jitsi:
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     ingress:
       enabled: {{ .Values.ingress.enabled }}
+      {{- if .Values.annotations.jitsiWeb.ingress }}
+      annotations:
+        {{- with .Values.annotations.jitsiWeb.ingress }}
+        {{ . | toYaml | nindent 8 }}
+        {{- end }}
+      {{- end }}
       ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
       hosts:
         - host: "{{ .Values.global.hosts.jitsi }}.{{ .Values.global.domain }}"
@@ -104,6 +112,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jitsi | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiWeb.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiWeb.pod | toYaml | nindent 6 }}
+    {{- end }}
   prosody:
     image:
       repository: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.prosody.registry }}/{{ .Values.images.prosody.repository }}"
@@ -153,6 +165,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.prosody | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiProsody.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiProsody.pod | toYaml | nindent 6 }}
+    {{- end }}
   jicofo:
     replicaCount: {{ .Values.replicas.jicofo }}
     image:
@@ -176,6 +192,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jicofo | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJicofo.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiJicofo.pod | toYaml | nindent 6 }}
+    {{- end }}
   jigasi:
     replicaCount: {{ .Values.replicas.jigasi }}
     enabled: {{ .Values.sip.jigasi.enabled }}
@@ -205,6 +225,10 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jigasi | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJigasi.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiJigasi.pod | toYaml | nindent 6 }}
+    {{- end }}
   jvb:
     replicaCount: {{ .Values.replicas.jvb }}
     # The `useNodeIP` option provided by the upstream charts does not support all relevant scenarios, but since
@@ -221,6 +245,10 @@ jitsi:
       {{ .Values.resources.jvb | toYaml | nindent 6 }}
     service:
       type: {{ coalesce .Values.service.type.jitsiVideoBridge .Values.cluster.service.type | quote }}
+    {{- if .Values.annotations.jitsiJvb.service }}
+      annotations:
+        {{ .Values.annotations.jitsiJvb.service | toYaml | nindent 8 }}
+    {{- end }}
     securityContext:
       allowPrivilegeEscalation: false
       capabilities: {}
@@ -233,6 +261,18 @@ jitsi:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.jvb | toYaml | nindent 8 }}
+    {{- if .Values.annotations.jitsiJvb.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiJvb.pod | toYaml | nindent 6 }}
+    {{- end }}
+    metrics:
+      prometheusAnnotations:
+        {{ .Values.annotations.jitsiJvb.metricsPrometheus | toYaml | nindent 8 }}
+      {{- if .Values.annotations.jitsiJvb.metricsGrafana }}
+      grafanaDashboards:
+        annotations:
+          {{ .Values.annotations.jitsiJvb.metricsGrafana | toYaml | nindent 10 }}
+      {{- end }}
   jibri:
     replicaCount: {{ .Values.replicas.jibri }}
     image:
@@ -249,10 +289,19 @@ jitsi:
       # Chart does not allow to template more
       capabilities:
         add: ["SYS_ADMIN"]
+    {{- if .Values.annotations.jitsiJibri.pod }}
+    podAnnotations:
+      {{ .Values.annotations.jitsiJibri.pod | toYaml | nindent 6 }}
+    {{- end }}
   imagePullSecrets:
   {{- range .Values.global.imagePullSecrets }}
     - name: {{ . | quote }}
   {{- end }}
+  {{- if .Values.annotations.jitsi.serviceAccount }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.jitsi.serviceAccount | toYaml | nindent 6 }}
+  {{- end }}
 
 patchJVB:
   configuration:
@@ -279,10 +328,17 @@ patchJVB:
     repository: {{ .Values.images.jitsiPatchJVB.repository | quote }}
     tag: {{ .Values.images.jitsiPatchJVB.tag | quote }}
 
-podAnnotations: {}
+{{- if .Values.annotations.jitsi.pod }}
+podAnnotations:
+  {{ .Values.annotations.jitsi.pod | toYaml | nindent 2 }}
+{{- end }}
 
 replicaCount: {{ .Values.replicas.jitsiKeycloakAdapter }}
 
 resources:
   {{ .Values.resources.jitsiKeycloakAdapter | toYaml | nindent 2 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.jitsi.serviceAccount | toYaml | nindent 4 }}
 ...

helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl

@@ -12,7 +12,10 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 additionalAnnotations:
-  intents.otterize.com/service-name: "opendesk-nextcloud-management"
+  intents.otterize.com/service-name: "opendesk-nextcloud-php"
+  {{- with .Values.annotations.nextcloudNextcloudMgmt.additional }}
+  {{ . | toYaml | nindent 2}}
+  {{- end }}
 
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
@@ -184,8 +187,6 @@ containerSecurityContext:
   runAsNonRoot: true
   seLinuxOptions:
     {{ .Values.seLinuxOptions.nextcloudManagement | toYaml | nindent 4 }}
-podSecurityContext:
-  fsGroup: 101
 
 debug:
   loglevel: {{ if .Values.debug.enabled }}"0"{{ else }}"2"{{ end }}
@@ -214,10 +215,20 @@ image:
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   tag: {{ .Values.images.nextcloud.tag | quote }}
 
-theme:
+podAnnotations:
-  {{ .Values.theme | toYaml | nindent 2 }}
+  {{ .Values.annotations.nextcloudNextcloudMgmt.pod | toYaml | nindent 2 }}
+
+podSecurityContext:
+  fsGroup: 101
 
 resources:
   {{ .Values.resources.nextcloud | toYaml | nindent 4 }}
 
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.nextcloudNextcloudMgmt.serviceAccount | toYaml | nindent 4 }}
+
+theme:
+  {{ .Values.theme | toYaml | nindent 2 }}
+
 ...

helmfile/apps/nextcloud/values-nextcloud.yaml.gotmpl

@@ -9,6 +9,13 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 exporter:
+
+  additionalAnnotations:
+    intents.otterize.com/service-name: "opendesk-nextcloud-exporter"
+    {{- with .Values.annotations.nextcloudExporter.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
+
   enabled: true
   configuration:
     server: "http://opendesk-nextcloud-aio"
@@ -34,7 +41,8 @@ exporter:
     repository: "{{ .Values.images.nextcloudExporter.repository }}"
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     tag: {{ .Values.images.nextcloudExporter.tag | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.nextcloudExporter.pod | toYaml | nindent 4 }}
   prometheus:
     serviceMonitor:
       enabled: {{ .Values.monitoring.prometheus.serviceMonitors.enabled }}
@@ -48,9 +56,17 @@ exporter:
   resources:
     {{ .Values.resources.nextcloudExporter | toYaml | nindent 4 }}
 
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nextcloudExporter.serviceAccount | toYaml | nindent 6 }}
+
 aio:
   additionalAnnotations:
     intents.otterize.com/service-name: "opendesk-nextcloud-aio"
+    {{- with .Values.annotations.nextcloudAio.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
+
   configuration:
     cache:
       auth:
@@ -139,11 +155,15 @@ aio:
       nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.nextcloud }}"
       nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.nextcloud }}s"
       nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.nextcloud }}s"
+      {{- with .Values.annotations.nextcloudAio.ingress }}
+        {{ . | toYaml | nindent 6 }}
+      {{- end }}
     ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
     host: "{{ .Values.global.hosts.nextcloud }}.{{ .Values.global.domain }}"
     tls:
       secretName: {{ .Values.ingress.tls.secretName | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.nextcloudAio.pod | toYaml | nindent 4 }}
   podSecurityContext:
     fsGroup: 101
   prometheus:
@@ -159,4 +179,12 @@ aio:
   resources:
     {{ .Values.resources.nextcloud | toYaml | nindent 4 }}
 
+  service:
+    annotations:
+      {{ .Values.annotations.nextcloudAio.service | toYaml | nindent 6 }}
+
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nextcloudAio.serviceAccount | toYaml | nindent 6 }}
+
 ...

helmfile/apps/notes/values.yaml.gotmpl

@@ -33,6 +33,9 @@ ingressCollaborationWS:
     nginx.ingress.kubernetes.io/proxy-read-timeout: "86400"
     nginx.ingress.kubernetes.io/proxy-send-timeout: "86400"
     nginx.ingress.kubernetes.io/upstream-hash-by: $arg_room
+    {{- with .Values.annotations.notes.ingressCollaborationWS }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
 
 ingressAdmin:
   enabled: {{ .Values.ingress.enabled }}
@@ -41,6 +44,8 @@ ingressAdmin:
   tls:
     enabled: "{{ .Values.ingress.tls.enabled }}"
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.notes.ingressAdmin | toYaml | nindent 4 }}
 
 ingressMedia:
   enabled: {{ .Values.ingress.enabled }}
@@ -54,6 +59,9 @@ ingressMedia:
     nginx.ingress.kubernetes.io/use-regex: "true"
     nginx.ingress.kubernetes.io/rewrite-target: /{{ .Values.objectstores.notes.bucket }}/$1
     nginx.ingress.kubernetes.io/session-cookie-path: /media
+    {{- with .Values.annotations.notes.ingressMedia }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   tls:
     enabled: "{{ .Values.ingress.tls.enabled }}"
     secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -66,11 +74,14 @@ ingressCollaborationApi:
   tls:
     enabled: "{{ .Values.ingress.tls.enabled }}"
     secretName: {{ .Values.ingress.tls.secretName | quote }}
-
+  annotations:
+    {{ .Values.annotations.notes.ingressCollaborationAPI | toYaml | nindent 4 }}
 
 serviceMedia:
   host: {{ .Values.objectstores.notes.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain) | quote }}
   port: {{ .Values.objectstores.notes.port | default 443 }}
+  annotations:
+    {{ .Values.annotations.notes.serviceMedia | toYaml | nindent 4 }}
 
 frontend:
   image:
@@ -103,6 +114,13 @@ frontend:
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesFrontend | toYaml | nindent 6 }}
 
+  podAnnotations:
+    {{ .Values.annotations.notesFrontend.pod | toYaml | nindent 4 }}
+
+  service:
+    annotations:
+      {{ .Values.annotations.notesFrontend.service | toYaml | nindent 6 }}
+
 yProvider:
   image:
     repository: {{ printf "%s/%s" (coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.notesYProvider.registry) (.Values.images.notesYProvider.repository) | quote }}
@@ -131,6 +149,13 @@ yProvider:
     COLLABORATION_SERVER_SECRET: {{ .Values.secrets.notes.collaborationSecret | quote }}
     Y_PROVIDER_API_KEY: {{ .Values.secrets.notes.collaborationSecret | quote }}
 
+  podAnnotations:
+    {{ .Values.annotations.notesYProvider.pod | toYaml | nindent 4 }}
+
+  service:
+    annotations:
+      {{ .Values.annotations.notesYProvider.service | toYaml | nindent 6 }}
+
 oidc:
   clientId: "opendesk-notes"
   clientSecret: {{ .Values.secrets.keycloak.clientSecret.notes | quote }}
@@ -215,6 +240,9 @@ backend:
         python manage.py migrate --no-input
     restartPolicy: Never
 
+  migrateJobAnnotations:
+    {{ .Values.annotations.notesBackend.migrateJob | toYaml | nindent 4 }}
+
   createsuperuser:
     command:
       - "/bin/sh"
@@ -223,6 +251,9 @@ backend:
         python manage.py createsuperuser --email default.admin@{{ .Values.global.domain }} --password {{ .Values.secrets.notes.superuser }}
     restartPolicy: Never
 
+  podAnnotations:
+    {{ .Values.annotations.notesBackend.pod | toYaml | nindent 4 }}
+
   resources:
     {{ .Values.resources.notesBackend | toYaml | nindent 4 }}
   securityContext:
@@ -239,4 +270,9 @@ backend:
     runAsNonRoot: true
     seLinuxOptions:
       {{ .Values.seLinuxOptions.notesBackend | toYaml | nindent 6 }}
+
+  service:
+    annotations:
+      {{ .Values.annotations.notesBackend.service | toYaml | nindent 6 }}
+
 ...

helmfile/apps/nubus/values-intercom-service.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.nubusIntercomService.additional | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -99,8 +102,11 @@ ingress:
   tls:
     enabled: {{ .Values.ingress.tls.enabled }}
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.nubusIntercomService.ingress | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.nubusIntercomService.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -150,4 +156,11 @@ replicaCount: {{ .Values.replicas.intercomService }}
 resources:
   {{ .Values.resources.intercomService | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.nubusIntercomService.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.nubusIntercomService.serviceAccount | toYaml | nindent 4 }}
 ...

helmfile/apps/nubus/values-nginx-s3-gateway.yaml.gotmpl

@@ -7,6 +7,9 @@ global:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
+additionalAnnotations:
+  {{ .Values.annotations.nubusNginxS3Gateway.additional | toYaml | nindent 2 }}
+
 image:
   registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.nginxS3Gateway.registry | quote }}
   repository: {{ .Values.images.nginxS3Gateway.repository | quote }}
@@ -20,6 +23,10 @@ ingress:
   annotations:
     nginx.ingress.kubernetes.io/rewrite-target: "/portal-assets/icons/$2/$3"
     nginx.ingress.kubernetes.io/use-regex: "true"
+    {{- with .Values.annotations.nubusNginxS3Gateway.ingress }}
+    {{. | toYaml | nindent 4 }}
+    {{- end }}
+
   path: "/univention/(portal|selfservice)/icons/(logos|entries)/(.*)$"
   tls:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
@@ -36,8 +43,20 @@ configuration:
     secretKey:
       value: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
 
+podAnnotations:
+  {{ .Values.annotations.nubusNginxS3Gateway.pod | toYaml | nindent 2 }}
+
 resources:
   {{ .Values.resources.nginxS3Gateway | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.nginxS3Gateway }}
+
+service:
+  annotations:
+    {{ .Values.annotations.nubusNginxS3Gateway.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.nubusNginxS3Gateway.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/nubus/values-nubus.yaml.gotmpl

@@ -3,6 +3,9 @@ SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlic
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.nubus.additional | toYaml | nindent 2 }}
+
 global:
   certManagerIssuer: {{ .Values.certificate.issuerRef.name | quote }}
   domain: {{ .Values.global.domain | quote }}
@@ -43,6 +46,12 @@ global:
         repository: {{ .Values.images.nubusOpendeskExtensionA2gMapper.repository }}
         imagePullPolicy: {{ .Values.global.imagePullPolicy }}
         tag: {{ .Values.images.nubusOpendeskExtensionA2gMapper.tag }}
+    - name: "twofa-selfservice"
+      image:
+        registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusTwoFaSelfserviceProvisioning.registry | quote }}
+        repository: {{ .Values.images.nubusTwoFaSelfserviceProvisioning.repository }}
+        imagePullPolicy: Always #{{ .Values.global.imagePullPolicy }}
+        tag: {{ .Values.images.nubusTwoFaSelfserviceProvisioning.tag }}
 
   # -- Allows to configure the system extensions to load. This is intended for
   # internal usage, prefer to use `global.extensions` for user configured
@@ -119,6 +128,22 @@ global:
             groups: __DELETE_KEY__
 
 ingress:
+  annotations:
+    nginx.ingress.kubernetes.io/proxy-body-size: "128k"
+    nginx.ingress.kubernetes.io/proxy-buffer-size: "64k"
+    nginx.ingress.kubernetes.io/proxy-buffers-number: "4"
+    nginx.ingress.kubernetes.io/proxy-busy-buffers-size: "128k"
+    nginx.ingress.kubernetes.io/proxy-http-version: "1.1"
+    nginx.ingress.kubernetes.io/proxy-set-headers: |
+      Host $http_host;
+      X-Forwarded-For $proxy_add_x_forwarded_for;
+      X-Forwarded-Host $http_x_forwarded_host;
+      X-Forwarded-Port $http_x_forwarded_port;
+      X-Forwarded-Proto $http_x_forwarded_proto;
+    nginx.ingress.kubernetes.io/use-regex: "true"
+    {{- with .Values.annotations.nubus.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   # temporary fix
   {{- if not .Values.apps.minio.enabled }}
   enabled: false
@@ -160,6 +185,8 @@ keycloak:
     runAsNonRoot: true
     seLinuxOptions:
       {{ .Values.seLinuxOptions.umsKeycloak | toYaml | nindent 6 }}
+  commonAnnotations:
+    {{ .Values.annotations.nubusKeycloak.common | toYaml | nindent 4 }}
   image:
     registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloak.registry | quote }}
     repository: {{ .Values.images.nubusKeycloak.repository }}
@@ -178,6 +205,9 @@ keycloak:
           adminPassword: "admin_password"
   podAnnotations:
     intents.otterize.com/service-name: "ums-keycloak"
+    {{- with .Values.annotations.nubusKeycloak.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   postgresql:
     connection:
       host: {{ .Values.databases.keycloak.host | quote }}
@@ -192,6 +222,12 @@ keycloak:
   replicaCount: {{ .Values.replicas.keycloak }}
   resources:
     {{ .Values.resources.umsKeycloak | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusKeycloak.service | toYaml | nindent 6 }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusKeycloak.serviceAccount | toYaml | nindent 6 }}
   {{- if .Values.certificate.selfSigned }}
   extraVolumes:
     - name: "trusted-cert-crt-secret-volume"
@@ -233,6 +269,9 @@ nubusGuardian:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-guardian-authorization-api"
+      {{- with .Values.annotations.nubusGuardian.authorizationApiPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     podSecurityContext:
       fsGroup: 1000
       fsGroupChangePolicy: "Always"
@@ -253,12 +292,67 @@ nubusGuardian:
         type: RuntimeDefault
       seLinuxOptions:
         {{ .Values.seLinuxOptions.umsGuardianAuthorizationApi | toYaml | nindent 8 }}
+  global:
+    podAnnotations:
+      {{ .Values.annotations.nubusGuardian.globalPod | toYaml | nindent 6 }}
   ingress:
+    annotations:
+      {{ .Values.annotations.nubusGuardian.ingressIngress | toYaml | nindent 6 }}
     certManager:
       enabled: false
     tls:
       enabled: {{ .Values.ingress.tls.enabled }}
       secretName: {{ .Values.ingress.tls.secretName | quote }}
+    items:
+      - name: management-ui
+        host: ""
+        # -- Define the Ingress paths.
+        paths:
+          - path: /univention/guardian/management-ui
+            pathType: Prefix
+            backend:
+              service:
+                name: guardian-management-ui
+                port:
+                  number: 80
+        ingressClassName: ""
+        annotations:
+          {{ .Values.annotations.nubusGuardian.ingressManagementUi | toYaml | nindent 10 }}
+        tls:
+          # enabled: true
+          secretName: ""
+      - name: management-api
+        host: ""
+        paths:
+          - path: /guardian/management
+            pathType: Prefix
+            backend:
+              service:
+                name: guardian-management-api
+                port:
+                  number: 80
+        ingressClassName: ""
+        annotations:
+          {{ .Values.annotations.nubusGuardian.ingressManagementApi | toYaml | nindent 10 }}
+        tls:
+          # enabled: true
+          secretName: ""
+      - name: authorization-api
+        host: ""
+        paths:
+          - path: /guardian/authorization
+            pathType: Prefix
+            backend:
+              service:
+                name: guardian-authorization-api
+                port:
+                  number: 80
+        ingressClassName: ""
+        annotations:
+          {{ .Values.annotations.nubusGuardian.ingressAuthorizationApi | toYaml | nindent 10 }}
+        tls:
+          # enabled: true
+          secretName: ""
   managementApi:
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusGuardianManagementApi.registry | quote }}
@@ -269,6 +363,9 @@ nubusGuardian:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-guardian-management-api"
+      {{- with .Values.annotations.nubusGuardian.managementApiPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     podSecurityContext:
       fsGroup: 1000
       fsGroupChangePolicy: "Always"
@@ -299,6 +396,9 @@ nubusGuardian:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-guardian-management-ui"
+      {{- with .Values.annotations.nubusGuardian.managementUiPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     replicaCount: {{ .Values.replicas.umsGuardianManagementUi }}
     resources:
       {{ .Values.resources.umsGuardianManagementUi | toYaml | nindent 6 }}
@@ -378,11 +478,17 @@ nubusGuardian:
       repository: {{ .Values.images.nubusGuardianProvisioning.repository }}
       tag: {{ .Values.images.nubusGuardianProvisioning.tag }}
       imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusGuardian.serviceAccount | toYaml | nindent 6 }}
 
 nubusNotificationsApi:
   enabled: false
   additionalAnnotations:
     intents.otterize.com/service-name: "ums-notifications-api"
+    {{- with .Values.annotations.nubusNotificationsApi.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -405,11 +511,22 @@ nubusNotificationsApi:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      {{- with .Values.annotations.nubusNotificationsApi.ingress }}
+      {{. | toYaml | nindent 6 }}
+      {{- end }}
     certManager:
       enabled: false
     tls:
       enabled: {{ .Values.ingress.tls.enabled }}
       secretName: {{ .Values.ingress.tls.secretName | quote }}
+  persistence:
+    annotations:
+      {{ .Values.annotations.nubusNotificationsApi.persistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusNotificationsApi.pod | toYaml | nindent 4 }}
   postgresql:
     connection:
       host: {{ .Values.databases.umsNotificationsApi.host | quote }}
@@ -419,7 +536,12 @@ nubusNotificationsApi:
       database: {{ .Values.databases.umsNotificationsApi.name | quote }}
       existingSecret:
         name: "ums-notifications-api-postgresql-opendesk-credentials"
+  service:
+    annotations:
+      {{ .Values.annotations.nubusNotificationsApi.service | toYaml | nindent 6 }}
   serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusNotificationsApi.serviceAccount | toYaml | nindent 6 }}
     create: true
   replicaCount: {{ .Values.replicas.umsNotificationsApi }}
   resources:
@@ -428,6 +550,9 @@ nubusNotificationsApi:
 nubusPortalFrontend:
   additionalAnnotations:
     intents.otterize.com/service-name: "ums-portal-frontend"
+    {{- with .Values.annotations.nubusPortalFrontend.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -450,11 +575,60 @@ nubusPortalFrontend:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
+    annotations:
+      {{ .Values.annotations.nubusPortalFrontend.ingressIngress | toYaml | nindent 6 }}
     certManager:
       enabled: false
+    items:
+      - name: rewrites
+        host: ""
+        paths:
+          - path: /univention/(portal|selfservice)/$
+            pathType: ImplementationSpecific
+          - path: /univention/(portal|selfservice)/index.html$
+            pathType: ImplementationSpecific
+          - path: /univention/(portal|selfservice)/(css|fonts|i18n|media|js|oidc|custom)(/.*)$
+            pathType: ImplementationSpecific
+          - path: /univention/(portal)/(icons)(/.*)$
+            pathType: ImplementationSpecific
+        ingressClassName: ""
+        annotations:
+          nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+          nginx.ingress.kubernetes.io/use-regex: "true"
+          {{- with .Values.annotations.nubusPortalFrontend.ingressRewrites }}
+          {{ . | toYaml | nindent 10 }}
+          {{- end }}
+        tls:
+          secretName: ""
+      - name: redirects
+        host: ""
+        paths:
+          - pathType: ImplementationSpecific
+            path: /$
+          - pathType: ImplementationSpecific
+            path: /univention$
+          - pathType: ImplementationSpecific
+            path: /univention/$
+          - pathType: ImplementationSpecific
+            path: /univention/portal$
+          - pathType: ImplementationSpecific
+            path: /univention/selfservice$
+        ingressClassName: ""
+        annotations:
+          nginx.ingress.kubernetes.io/permanent-redirect: "/univention/portal/"
+          {{- with .Values.annotations.nubusPortalFrontend.ingressRedirects }}
+          {{ . | toYaml | nindent 10 }}
+          {{- end }}
+        tls:
+          secretName: ""
     tls:
       enabled: {{ .Values.ingress.tls.enabled }}
       secretName: {{ .Values.ingress.tls.secretName }}
+  persistence:
+    annotations:
+      {{ .Values.annotations.nubusPortalFrontend.persistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusPortalFrontend.pod | toYaml | nindent 4 }}
   portalFrontend:
     branding:
       css: {{ .Values.theme.styles.portal.main | toJson }}
@@ -463,12 +637,19 @@ nubusPortalFrontend:
       # The actual `logo` is set in customizing image, the logo down here is for for waiting spinner.
       logo: {{ .Values.theme.imagery.portal.waitingSpinnerSvg | toJson }}
       backgroundImage: {{ .Values.theme.imagery.portal.backgroundSvg | toJson }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusPortalFrontend.service | toYaml | nindent 6 }}
   serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusPortalFrontend.serviceAccount | toYaml | nindent 6 }}
     create: true
   replicaCount: {{ .Values.replicas.umsPortalFrontend }}
   resources:
     {{ .Values.resources.umsPortalFrontend | toYaml | nindent 4 }}
 
+
+
 nubusKeycloakExtensions:
   enabled: true
   keycloak:
@@ -479,6 +660,8 @@ nubusKeycloakExtensions:
         keyMapping:
           adminPassword: "admin_password"
   proxy:
+    additionalAnnotations:
+      {{ .Values.annotations.nubusKeycloakExtensions.proxyAdditional | toYaml | nindent 6 }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusKeycloakExtensionProxy.registry | quote }}
       repository: {{ .Values.images.nubusKeycloakExtensionProxy.repository }}
@@ -487,6 +670,12 @@ nubusKeycloakExtensions:
     imagePullSecrets:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     ingress:
+      annotations:
+        nginx.org/proxy-buffer-size: "8k"
+        nginx.ingress.kubernetes.io/proxy-buffer-size: "8k"
+        {{- with .Values.annotations.nubusKeycloakExtensions.proxyIngress }}
+        {{ . | toYaml | nindent 8 }}
+        {{- end }}
       paths:
         {{- if .Values.debug.enabled }}
         - pathType: "Prefix"
@@ -507,6 +696,9 @@ nubusKeycloakExtensions:
         secretName: {{ .Values.ingress.tls.secretName | quote }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-keycloak-extensions-proxy"
+      {{- with .Values.annotations.nubusKeycloakExtensions.proxyPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     replicaCount: {{ .Values.replicas.umsKeycloakExtensionsProxy }}
     resources:
       {{ .Values.resources.umsKeycloakExtensionProxy | toYaml | nindent 6 }}
@@ -515,6 +707,12 @@ nubusKeycloakExtensions:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.umsKeycloakExtensionHandler | toYaml | nindent 8 }}
+    service:
+      annotations:
+        {{ .Values.annotations.nubusKeycloakExtensions.proxyService | toYaml | nindent 8 }}
+    serviceAccount:
+      annotations:
+        {{ .Values.annotations.nubusKeycloakExtensions.proxyServiceAccount | toYaml | nindent 8 }}
   postgresql:
     connection:
       host: {{ .Values.databases.keycloakExtension.host | quote }}
@@ -542,6 +740,8 @@ nubusKeycloakExtensions:
         keyMapping:
           password: "umcKeycloakExtensionsSmtpPassword"
   handler:
+    additionalAnnotations:
+      {{ .Values.annotations.nubusKeycloakExtensions.handlerAdditional | toYaml | nindent 6 }}
     appConfig:
       newDeviceLoginNotificationEnable: {{ if .Values.functional.authentication.newDeviceLoginNotification.enabled }}"True"{{ else }}"False"{{ end }}
       logLevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"WARN"{{ end }}
@@ -556,6 +756,9 @@ nubusKeycloakExtensions:
       {{ .Values.global.imagePullSecrets | toYaml | nindent 6 }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-keycloak-extensions-handler"
+      {{- with .Values.annotations.nubusKeycloakExtensions.handlerPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     replicaCount: {{ .Values.replicas.umsKeycloakExtensionsHandler }}
     resources:
       {{ .Values.resources.umsKeycloakExtensionHandler | toYaml | nindent 6 }}
@@ -564,6 +767,12 @@ nubusKeycloakExtensions:
         type: "RuntimeDefault"
       seLinuxOptions:
         {{ .Values.seLinuxOptions.umsKeycloakExtensionHandler | toYaml | nindent 8 }}
+    service:
+      annotations:
+        {{ .Values.annotations.nubusKeycloakExtensions.handlerService | toYaml | nindent 8 }}
+    serviceAccount:
+      annotations:
+        {{ .Values.annotations.nubusKeycloakExtensions.handlerServiceAccount | toYaml | nindent 8 }}
 
 nubusPortalListener:
   enabled: false
@@ -571,6 +780,9 @@ nubusPortalListener:
 nubusPortalConsumer:
   enabled: true
   portalConsumer:
+    editable: false
+    editable: false
+    editable: false
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusPortalConsumer.registry | quote }}
       repository: {{ .Values.images.nubusPortalConsumer.repository }}
@@ -594,6 +806,9 @@ nubusPortalConsumer:
       storageClass: {{ coalesce .Values.persistence.storages.nubusPortalConsumer.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
   podAnnotations:
     intents.otterize.com/service-name: "ums-portal-consumer"
+    {{- with .Values.annotations.nubusPortalConsumer.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   provisioningApi:
     auth:
       username: "portal-consumer"
@@ -603,7 +818,7 @@ nubusPortalConsumer:
     {{ .Values.resources.umsPortalConsumer | toYaml | nindent 4 }}
   resourcesWaitForDependency:
     {{ .Values.resources.umsPortalConsumerDependencies | toYaml | nindent 4 }}
-  securityContext:
+  containerSecurityContext:
     seccompProfile:
       type: "RuntimeDefault"
     seLinuxOptions:
@@ -650,6 +865,9 @@ nubusPortalConsumer:
 nubusPortalServer:
   additionalAnnotations:
     intents.otterize.com/service-name: "ums-portal-server"
+    {{- with .Values.annotations.nubusPortalServer.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -672,6 +890,13 @@ nubusPortalServer:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
+    annotations:
+        nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+        nginx.ingress.kubernetes.io/use-regex: "true"
+        {{- with .Values.annotations.nubusPortalServer.ingress }}
+        {{ . | toYaml | nindent 8 }}
+        {{- end }}
+
     certManager:
       enabled: false
     tls:
@@ -679,10 +904,18 @@ nubusPortalServer:
       secretName: {{ .Values.ingress.tls.secretName | quote }}
   objectStorage:
     auth:
-      accessKey: {{ .Values.objectstores.nubus.username | quote }}
+      accessKeyId: {{ .Values.objectstores.nubus.username | quote }}
-      secretKey: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
+      secretAccessKey: {{ .Values.objectstores.nubus.secretKey | default .Values.secrets.minio.umsUser | quote }}
     bucketName: {{ .Values.objectstores.nubus.bucket | quote }}
     endpoint: {{ printf "https://%s" (.Values.objectstores.nubus.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
+  persistence:
+    annotations:
+      {{ .Values.annotations.nubusPortalServer.persistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusPortalServer.pod | toYaml | nindent 4 }}
+  portalServer:
+    objectStorageEndpoint: {{ printf "https://%s" (.Values.objectstores.nubus.endpoint | default (printf "%s.%s" .Values.global.hosts.minioApi .Values.global.domain)) | quote }}
+    objectStorageBucket: {{ .Values.objectstores.nubus.bucket | quote }}
     objectStorageCredentialSecret:
       name: "ums-portal-server-minio-opendesk-credentials"
       accessKeyKey: "access-key-id"
@@ -690,13 +923,19 @@ nubusPortalServer:
   portalServer:
     centralNavigation:
       enabled: true
-      authenticatorSecretName: "ums-opendesk-portal-server-central-navigation"
+      existingSecret:
+        name: "ums-opendesk-portal-server-central-navigation"
     featureToggles:
       notifications_api: false
   replicaCount: {{ .Values.replicas.umsPortalServer }}
   resources:
     {{ .Values.resources.umsPortalServer | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusPortalServer.service | toYaml | nindent 6 }}
   serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusPortalServer.serviceAccount | toYaml | nindent 6 }}
     create: true
   {{- if .Values.certificate.selfSigned }}
   extraVolumes:
@@ -730,6 +969,9 @@ nubusPortalServer:
 nubusUdmRestApi:
   additionalAnnotations:
     intents.otterize.com/service-name: "ums-udm-rest-api"
+    {{- with .Values.annotations.nubusUdmRestApi.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -748,6 +990,15 @@ nubusUdmRestApi:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
     enabled: {{ .Values.functional.externalServices.nubus.udmRestApi.enabled }}
+    annotations:
+      nginx.ingress.kubernetes.io/proxy-buffer-size: "64k"
+      nginx.ingress.kubernetes.io/configuration-snippet-disabled: |
+        rewrite ^/univention(/udm/.*)$ $1 break;
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+      {{- with .Values.annotations.nubusUdmRestApi.ingress }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     certManager:
       enabled: false
     tls:
@@ -755,12 +1006,23 @@ nubusUdmRestApi:
       secretName: {{ .Values.ingress.tls.secretName | quote }}
   initResources:
     {{ .Values.resources.umsUdmRestApiInit | toYaml | nindent 4 }}
+  persistence:
+    annotations:
+      {{ .Values.annotations.nubusUdmRestApi.persistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusUdmRestApi.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUdmRestApi }}
   resources:
     {{ .Values.resources.umsUdmRestApi | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusUdmRestApi.service | toYaml | nindent 6 }}
   serviceAccount:
     annotations:
       intended.usage: "compliance"
+      {{- with .Values.annotations.nubusUdmRestApi.serviceAccount }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   udmRestApi:
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusUdmRestApi.registry | quote }}
@@ -769,6 +1031,8 @@ nubusUdmRestApi:
       imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 nubusLdapNotifier:
+  additionalAnnotations:
+    {{ .Values.annotations.nubusLdapNotifier.additional | toYaml | nindent 4 }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -792,11 +1056,22 @@ nubusLdapNotifier:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   podAnnotations:
     intents.otterize.com/service-name: "ums-ldap-notifier"
+    {{- with .Values.annotations.nubusLdapNotifier.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   replicaCount: {{ .Values.replicas.umsLdapNotifier }}
   resources:
     {{ .Values.resources.umsLdapNotifier | toYaml | nindent 4 }}
+service:
+    annotations:
+      {{ .Values.annotations.nubusLdapNotifier.service | toYaml | nindent 6 }}
+serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusLdapNotifier.serviceAccount | toYaml | nindent 6 }}
 
 nubusLdapServer:
+  additionalAnnotations:
+    {{ .Values.annotations.nubusLdapServer.additional | toYaml | nindent 4 }}
   global:
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     imagePullSecrets:
@@ -825,13 +1100,20 @@ nubusLdapServer:
   persistence:
     size: {{ .Values.persistence.storages.nubusLdapServerData.size | quote }}
     storageClass: {{ coalesce .Values.persistence.storages.nubusLdapServerData.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  podAnnotations:
+    {{ .Values.annotations.nubusLdapServer.pod | toYaml | nindent 4 }}
   replicaCountPrimary: {{ .Values.replicas.umsLdapServerPrimary }}
   replicaCountSecondary: {{ .Values.replicas.umsLdapServerSecondary }}
   replicaCountProxy: {{ .Values.replicas.umsLdapServerProxy }}
   resources: {{ .Values.resources.umsLdapServer | toYaml | nindent 4 }}
   resourcesPrimary: {{ .Values.resources.umsLdapServer | toYaml | nindent 4 }}
   resourcesSecondary: {{ .Values.resources.umsLdapServer | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusLdapServer.service | toYaml | nindent 6 }}
   serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusLdapServer.serviceAccount | toYaml | nindent 6 }}
     create: true
   waitForDependency:
     image:
@@ -842,9 +1124,14 @@ nubusLdapServer:
 
 nubusProvisioning:
   enabled: true
+  additionalAnnotations:
+    {{ .Values.annotations.nubusProvisioning.additional | toYaml | nindent 4 }}
   api:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-api"
+      {{- with .Values.annotations.nubusProvisioning.apiAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     auth:
       adminPassword: {{ .Values.secrets.nubus.provisioning.api.adminPassword | quote }}
       prefillPassword: {{ .Values.secrets.nubus.provisioning.api.prefillPassword | quote}}
@@ -857,6 +1144,8 @@ nubusProvisioning:
     nats:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.api.natsPassword | quote}}
+    podAnnotations:
+      {{ .Values.annotations.nubusProvisioning.apiPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningApi | toYaml | nindent 6 }}
   containerSecurityContext:
@@ -876,6 +1165,9 @@ nubusProvisioning:
   dispatcher:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-dispatcher"
+      {{- with .Values.annotations.nubusProvisioning.dispatcherAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusProvisioningDispatcher.registry | quote }}
       repository: {{ .Values.images.nubusProvisioningDispatcher.repository }}
@@ -884,6 +1176,8 @@ nubusProvisioning:
     nats:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.dispatcherNatsPassword | quote}}
+    podAnnotations:
+      {{ .Values.annotations.nubusProvisioning.dispatcherPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningDispatcher | toYaml | nindent 6 }}
   imagePullSecrets:
@@ -894,6 +1188,9 @@ nubusProvisioning:
   nats:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-nats"
+      {{- with .Values.annotations.nubusProvisioning.natsAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     auth:
       adminPassword: {{ .Values.secrets.nats.natsAdminPassword | quote }}
     config:
@@ -940,9 +1237,14 @@ nubusProvisioning:
       {{ .Values.resources.umsProvisioningNats | toYaml | nindent 6 }}
     serviceAccount:
       create: true
+  podAnnotations:
+    {{ .Values.annotations.nubusProvisioning.pod | toYaml | nindent 4 }}
   prefill:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-prefill"
+      {{- with .Values.annotations.nubusProvisioning.prefillAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusProvisioningPrefill.registry | quote }}
       repository: {{ .Values.images.nubusProvisioningPrefill.repository }}
@@ -951,11 +1253,16 @@ nubusProvisioning:
     nats:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.prefillNatsPassword | quote}}
+    podAnnotations:
+      {{ .Values.annotations.nubusProvisioning.prefillPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningPrefill | toYaml | nindent 6 }}
   udmTransformer:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-udm-transformer"
+      {{- with .Values.annotations.nubusProvisioning.udmTransformerAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusProvisioningUdmTransformer.registry | quote }}
       repository: {{ .Values.images.nubusProvisioningUdmTransformer.repository }}
@@ -964,6 +1271,8 @@ nubusProvisioning:
     nats:
       auth:
         password: {{ .Values.secrets.nubus.provisioning.udmTransformerNatsPassword | quote}}
+    podAnnotations:
+      {{ .Values.annotations.nubusProvisioning.udmTransformerPod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.umsProvisioningUdmTransformer | toYaml | nindent 6 }}
   replicaCount:
@@ -974,6 +1283,9 @@ nubusProvisioning:
   registerConsumers:
     additionalAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-register-consumers"
+      {{- with .Values.annotations.nubusProvisioning.registerConsumersAdditional }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     {{- if .Values.apps.oxAppSuite.enabled }}
     createUsers:
       oxConsumer:
@@ -989,10 +1301,18 @@ nubusProvisioning:
       imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     podAnnotations:
       intents.otterize.com/service-name: "ums-provisioning-register-consumers"
+      {{- with .Values.annotations.nubusProvisioning.registerConsumersPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
   resources:
     registerConsumers:
       {{ .Values.resources.umsProvisioningRegisterConsumers | toYaml | nindent 6 }}
+  service:
+    annotations:
+      {{ .Values.annotations.nubusProvisioning.service | toYaml | nindent 6 }}
   serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusProvisioning.serviceAccount | toYaml | nindent 6 }}
     create: true
 
 nubusUdmListener:
@@ -1018,12 +1338,17 @@ nubusUdmListener:
     pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusUdmListener.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUdmListener }}
   resources:
     {{ .Values.resources.umsUdmListener | toYaml | nindent 4 }}
   nats:
     auth:
       password: {{ .Values.secrets.nubus.provisioning.udmListenerNatsPassword | quote}}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusUdmListener.serviceAccount | toYaml | nindent 6 }}
 
 nubusSelfServiceListener:
   enabled: false
@@ -1057,6 +1382,9 @@ nubusSelfServiceConsumer:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   podAnnotations:
     intents.otterize.com/service-name: "ums-selfservice-listener"
+    {{- with .Values.annotations.nubusSelfserviceConsumer.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   provisioningApi:
     auth:
       password: {{ .Values.secrets.nubus.selfserviceConsumer.provisioningApiPassword | quote}}
@@ -1065,6 +1393,9 @@ nubusSelfServiceConsumer:
   resourcesWaitForDependency:
     {{ .Values.resources.umsSelfserviceConsumer | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsSelfserviceConsumer }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusSelfserviceConsumer.serviceAccount | toYaml | nindent 6 }}
   waitForDependency:
     image:
       registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.nubusWaitForDependency.registry | quote }}
@@ -1078,6 +1409,9 @@ nubusStackDataUms:
     argocd.argoproj.io/hook: "Sync"
     argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
     intents.otterize.com/service-name: "ums-stack-data-ums"
+    {{- with .Values.annotations.nubusStackDataUms.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -1120,6 +1454,8 @@ nubusStackDataUms:
         username: {{ .Values.databases.umsSelfservice.username | quote }}
       connection:
         host: {{ .Values.databases.umsSelfservice.host | quote }}
+  podAnnotations:
+    {{ .Values.annotations.nubusStackDataUms.pod | toYaml | nindent 4 }}
   pullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   resources:
@@ -1136,6 +1472,9 @@ nubusStackDataUms:
     smtpUser: {{ printf "%s@%s" "opendesk-system" ( .Values.global.mailDomain | default .Values.global.domain ) }}
     smtpStartTls: false
     ldapBase: {{ .Values.ldap.baseDn }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusStackDataUms.serviceAccount | toYaml | nindent 6 }}
   templateContext:
     initialPasswordAdministrator: {{ .Values.secrets.nubus.systemAccounts.administratorPassword | quote }}
     apps: {{ .Values.apps | toYaml | nindent 6 }}
@@ -1160,6 +1499,7 @@ nubusStackDataUms:
     portalLinkPrivacyStatement: {{ .Values.functional.portal.linkPrivacyStatement }}
     oxDefaultContext: "1"
     oxContextHidden: true
+    portalTwoFaLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.twofaSelfservice .Values.global.domain }}
     ldapSearchUsers:
       {{- range $username, $password := .Values.secrets.nubus.ldapSearch }}
       - username: {{ printf "ldapsearch_%s" $username | quote }}
@@ -1208,6 +1548,9 @@ nubusStackDataUms:
 nubusUmcServer:
   additionalAnnotations:
     intents.otterize.com/service-name: "ums-umc-server"
+    {{- with .Values.annotations.nubusUmcServer.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   containerSecurityContext:
     enabled: true
     allowPrivilegeEscalation: false
@@ -1272,6 +1615,14 @@ nubusUmcServer:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+      nginx.ingress.kubernetes.io/configuration-snippet: |
+          proxy_set_header X-UMC-HTTPS 'on';
+      {{- with .Values.annotations.nubusUmcServer.ingress }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     certManager:
       enabled: false
     tls:
@@ -1285,6 +1636,8 @@ nubusUmcServer:
         name: "ums-umc-server-memcached-opendesk-credentials"
         keyMapping:
           memcached-password: "umcServerMemcachedPassword"
+  podAnnotations:
+    {{ .Values.annotations.nubusUmcServer.pod | toYaml | nindent 4 }}
   postgresql:
     bundled: false
     connection:
@@ -1323,6 +1676,9 @@ nubusUmcServer:
 
         Mit freundlichen Grüßen
         Ihr {domainname} Passwort-Service
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusUmcServer.serviceAccount | toYaml | nindent 6 }}
   smtp:
     existingSecret:
       name: "ums-umc-server-smtp-credentials-custom"
@@ -1351,6 +1707,12 @@ nubusUmcGateway:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
   ingress:
+    annotations:
+      nginx.ingress.kubernetes.io/use-regex: "true"
+      nginx.ingress.kubernetes.io/rewrite-target: "/$2$3"
+    {{- with .Values.annotations.nubusUmcGateway.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
     certManager:
       enabled: false
     tls:
@@ -1358,13 +1720,21 @@ nubusUmcGateway:
       secretName: {{ .Values.ingress.tls.secretName | quote }}
   initResources:
     {{ .Values.resources.umsUmcGateway | toYaml | nindent 4 }}
+  podAnnotations:
+    {{ .Values.annotations.nubusUmcGateway.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.umsUmcGateway }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusUmcGateway.serviceAccount | toYaml | nindent 6 }}
   resources:
     {{ .Values.resources.umsUmcGateway | toYaml | nindent 4 }}
 
 nubusKeycloakBootstrap:
   additionalAnnotations:
     argocd.argoproj.io/hook: "Sync"
+    {{- with .Values.annotations.nubusKeycloakBootstrapNubus.additional }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   bootstrap:
     ldapMappers:
       - ldapAndUserModelAttributeName: "opendeskProjectmanagementAdmin"
@@ -1405,6 +1775,9 @@ nubusKeycloakBootstrap:
         name: "ums-keycloak-bootstrap-ldap-opendesk-credentials"
   podAnnotations:
     intents.otterize.com/service-name: "ums-keycloak-bootstrap"
+    {{- with .Values.annotations.nubusKeycloakBootstrapNubus.pod }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   resources:
     {{ .Values.resources.umsKeycloakBootstrap | toYaml | nindent 4 }}
   waitForDependency:
@@ -1413,12 +1786,15 @@ nubusKeycloakBootstrap:
       repository: {{ .Values.images.nubusWaitForDependency.repository }}
       tag: {{ .Values.images.nubusWaitForDependency.tag }}
       imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.nubusKeycloakBootstrapNubus.serviceAccount | toYaml | nindent 6 }}
 
 # Credential secrets for accessing customer supplied services
 extraSecrets:
   - name: "ums-opendesk-portal-server-central-navigation"
     stringData:
-      authenticator.secret: {{ .Values.secrets.centralnavigation.apiKey | quote }}
+      password: {{ .Values.secrets.centralnavigation.apiKey | quote }}
   - name: "ums-opendesk-guardian-client-secret"
     stringData:
       managementApiClientSecret: {{ .Values.secrets.keycloak.clientSecret.guardian | quote }}

helmfile/apps/nubus/values-opendesk-keycloak-bootstrap.yaml.gotmpl

@@ -1,5 +1,5 @@
 {{/*
-SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+SPDX-FileCopyrightText: 2024-2025 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
@@ -110,8 +110,13 @@ config:
     clientSessionMaxLifespan: {{ .Values.functional.authentication.realmSettings.clientSessionMaxLifespan }}
     clientOfflineSessionIdleTimeout: {{ .Values.functional.authentication.realmSettings.clientOfflineSessionIdleTimeout }}
     clientOfflineSessionMaxLifespan: {{ .Values.functional.authentication.realmSettings.clientOfflineSessionMaxLifespan }}
+  ssoFederation:
+    enabled: {{ .Values.functional.authentication.ssoFederation.enabled }}
+    enforceFederatedLogin: {{ .Values.functional.authentication.ssoFederation.enforceFederatedLogin }}
+    name: {{ .Values.functional.authentication.ssoFederation.name | quote }}
+    idpDetails: {{ .Values.functional.authentication.ssoFederation.idpDetails | toYaml | nindent 6 }}
   twoFactorSettings:
-    additionalGroups: {{ .Values.functional.authentication.twoFactor.groups }}
+    additionalGroups: {{ .Values.functional.authentication.twoFactor.groups | toYaml | nindent 6 }}
   precreateGroups: [ 'Domain Admins', 'Domain Users', '2fa-users', 'IAM API - Full Access',
                      {{ if .Values.apps.nextcloud.enabled }}'managed-by-attribute-Fileshare', 'managed-by-attribute-FileshareAdmin',{{ end }}
                      {{ if .Values.apps.xwiki.enabled }}'managed-by-attribute-Knowledgemanagement', 'managed-by-attribute-KnowledgemanagementAdmin',{{ end }}
@@ -120,7 +125,7 @@ config:
                      {{ if .Values.apps.jitsi.enabled }}'managed-by-attribute-Videoconference',{{ end }}
                      {{ if .Values.apps.oxAppSuite.enabled }}'managed-by-attribute-Groupware',{{ end }}
                      {{ if .Values.apps.notes.enabled }}'managed-by-attribute-Notes',{{ end }}
-                      ]
+                   ]
 
   opendesk:
     # We use client specific scopes as we bind them to Keycloak role membership which itself is linked
@@ -754,11 +759,17 @@ containerSecurityContext:
     {{ .Values.seLinuxOptions.opendeskKeycloakBootstrap | toYaml | nindent 4 }}
 
 additionalAnnotations:
-    argocd.argoproj.io/hook: "Sync"
+  argocd.argoproj.io/hook: "Sync"
-    argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
+  argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
+  {{- with .Values.annotations.nubusKeycloakBootstrap.additional }}
+  {{. | toYaml | nindent 2 }}
+  {{- end }}
 
 podAnnotations:
   intents.otterize.com/service-name: "ums-keycloak-bootstrap"
+  {{- with .Values.annotations.nubusKeycloakBootstrap.pod }}
+  {{. | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
@@ -768,6 +779,10 @@ podSecurityContext:
 resources:
   {{ .Values.resources.opendeskKeycloakBootstrap | toYaml | nindent 2 }}
 
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.nubusKeycloakBootstrap.serviceAccount | toYaml | nindent 4 }}
+
 {{- if .Values.certificate.selfSigned }}
 extraVolumes:
   - name: "trusted-cert-secret-volume"

helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.openxchangeDovecot.common | toYaml | nindent 2 }}
+
 image:
   registry: {{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.dovecot.registry | quote }}
   repository: {{ .Values.images.dovecot.repository | quote }}
@@ -79,9 +82,6 @@ containerSecurityContext:
   seLinuxOptions:
     {{ .Values.seLinuxOptions.dovecot | toYaml | nindent 4 }}
 
-
-podAnnotations: {}
-
 {{- if .Values.certificate.selfSigned }}
 extraVolumes:
   - name: "trusted-cert-secret-volume"
@@ -111,14 +111,26 @@ persistence:
     - "ReadWriteOnce"
   {{- end }}
   size: {{ .Values.persistence.storages.dovecot.size | quote }}
+  annotations:
+    {{ .Values.annotations.openxchangeDovecot.persistence | toYaml | nindent 4 }}
+
+podAnnotations:
+  {{ .Values.annotations.openxchangeDovecot.pod | toYaml | nindent 2 }}
 
 resources:
   {{ .Values.resources.dovecot | toYaml | nindent 2 }}
 
 {{- if or (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "NodePort") (eq (coalesce .Values.service.type.dovecot .Values.cluster.service.type) "LoadBalancer") }}
 service:
+  annotations:
+    {{ .Values.annotations.openxchangeDovecot.service | toYaml | nindent 4 }}
   external:
     enabled: true
     type: {{ coalesce .Values.service.type.dovecot .Values.cluster.service.type | quote }}
 {{- end }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.openxchangeDovecot.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/open-xchange/values-openxchange-bootstrap.yaml.gotmpl

@@ -4,6 +4,13 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  argocd.argoproj.io/hook: "Sync"
+  argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
+  {{- with .Values.annotations.openxchangeBootstrap.additional }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
+
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
   deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
@@ -31,7 +38,8 @@ image:
 imagePullSecrets:
   {{ .Values.global.imagePullSecrets | toYaml | nindent 2 }}
 
-additionalAnnotations:
+serviceAccount:
-  argocd.argoproj.io/hook: "Sync"
+  annotations:
-  argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
+    {{ .Values.annotations.openxchangeBootstrap.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/open-xchange/values-openxchange-contact-picker.yaml.gotmpl

@@ -6,7 +6,11 @@ SPDX-License-Identifier: Apache-2.0
 ---
 appsuite:
   core-mw:
-
+    podAnnotations:
+      logging.open-xchange.com/format: "appsuite-json"
+      {{- with .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwPod }}
+      {{ . | toYaml | nindent 6 }}
+      {{- end }}
     properties:
       # Enterprise contact picker
       com.openexchange.contacts.ldap.accounts: "opendesk,other,functional"
@@ -28,6 +32,10 @@ appsuite:
               dn: "uid=ldapsearch_ox,cn=users,{{ .Values.ldap.baseDn }}"
               password: {{ .Values.secrets.nubus.ldapSearch.ox | quote }}
 
+    serviceAccount:
+      annotations:
+        {{ .Values.annotations.openxchangeEnterpriseContactPicker.appsuiteCoreMwServiceAccount | toYaml | nindent 8 }}
+
     uiSettings:
       # Enterprise contact picker
       io.ox/core//features/enterprisePicker/enabled: "true"

helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl

@@ -32,7 +32,8 @@ nextcloud-integration-ui:
   {{- range .Values.global.imagePullSecrets }}
     - name: {{ . | quote }}
   {{- end }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.openxchangeNextcloudIntegrationUi.pod | toYaml | nindent 4 }}
   replicaCount: {{ .Values.replicas.openxchangeNextcloudIntegrationUI }}
   resources:
     {{ .Values.resources.openxchangeNextcloudIntegrationUI | toYaml | nindent 4 }}
@@ -66,7 +67,8 @@ public-sector-ui:
   {{- end }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
   replicaCount: {{ .Values.replicas.openxchangePublicSectorUI }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.openxchangePublicSectorUi.pod | toYaml | nindent 4 }}
   resources:
     {{ .Values.resources.openxchangePublicSectorUI | toYaml | nindent 4 }}
   securityContext:
@@ -95,6 +97,8 @@ appsuite:
   istio:
     enabled: false
   ingress:
+    annotations:
+      {{ .Values.annotations.openxchangeAppsuiteIngress.ingress | toYaml | nindent 6 }}
     enabled: {{ .Values.ingress.enabled }}
     ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
     tls:
@@ -107,11 +111,101 @@ appsuite:
       hosts:
         - "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
     routes:
+      appsuite-base:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.appsuitebase | toYaml | nindent 10 }}
+      rootredirect:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.rootredirect | toYaml | nindent 10 }}
+      trailslash:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.trailslash | toYaml | nindent 10 }}
+      rest-routes-admin:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesAdmin | toYaml | nindent 10 }}
+      rest-routes-advertisement:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesAdvertisement | toYaml | nindent 10 }}
+      rest-routes-chronos:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesChronos | toYaml | nindent 10 }}
+      rest-routes-preliminary:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesPreliminary | toYaml | nindent 10 }}
+      rest-routes-userfeedback:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.restRoutesUserfeedback | toYaml | nindent 10 }}
+      static-routes-servlet:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesServlet | toYaml | nindent 10 }}
+      static-routes-realtime:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesRealtime | toYaml | nindent 10 }}
+      static-routes-infostore:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesInfostore | toYaml | nindent 10 }}
+      static-routes-webservices:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.staticRoutesWebservices | toYaml | nindent 10 }}
+      drive-client-windows-ox-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.driveClientWindowsOxRoute | toYaml | nindent 10 }}
+      guard-api-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.guardApiRoute | toYaml | nindent 10 }}
+      guard-support-api-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.guardSupportApiRoute | toYaml | nindent 10 }}
+      guard-pgp-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.guardPgpRoute | toYaml | nindent 10 }}
+      http-api-routes-api:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesApi | toYaml | nindent 10 }}
+      http-api-routes-ajax:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAjax | toYaml | nindent 10 }}
       http-api-routes-appsuite-api:
         annotations:
           nginx.ingress.kubernetes.io/proxy-body-size: "{{ .Values.ingress.parameters.bodySize.oxAppSuite }}"
           nginx.ingress.kubernetes.io/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.oxAppSuite }}"
           nginx.ingress.kubernetes.io/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.oxAppSuite }}"
+          {{- with .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAppsuiteApi }}
+          {{ . | toYaml | nindent 10 }}
+          {{- end }}
+      http-api-routes-app-root-api:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.httpApiRoutesAppRootApi | toYaml | nindent 10 }}
+      rt2-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.rt2Route | toYaml | nindent 10 }}
+      documents-help-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.documentsHelpRoute | toYaml | nindent 10 }}
+      drive-help-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.driveHelpRoute | toYaml | nindent 10 }}
+      core-help-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.coreHelpRoute | toYaml | nindent 10 }}
+      office-web-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.officeWebRoute | toYaml | nindent 10 }}
+      caldav-well-known-redirect:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.caldavWellKnownRedirect | toYaml | nindent 10 }}
+      carddav-well-known-redirect:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.carddavWellKnownRedirect | toYaml | nindent 10 }}
+      dav-infostore-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.davInfostoreRoute | toYaml | nindent 10 }}
+      dav-root-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.davRootRoute | toYaml | nindent 10 }}
+      wopi-server-route:
+        annotations:
+          {{ .Values.annotations.openxchangeAppsuiteIngress.wopiServerRoute | toYaml | nindent 10 }}
       trailslash:
         enabled: false
   core-mw:
@@ -131,8 +225,11 @@ appsuite:
     jolokiaLogin: "jolokia"
     jolokiaPassword: {{ .Values.secrets.oxAppSuite.jolokiaPassword | quote }}
     hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
-    podAnnotations: {}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreMw.pod | toYaml | nindent 6 }}
     serviceAccount:
+      annotations:
+        {{ .Values.annotations.openxchangeAppsuiteCoreMw.serviceAccount | toYaml | nindent 8 }}
       create: true
     features:
       status:
@@ -151,7 +248,8 @@ appsuite:
         tag: {{ .Values.images.openxchangeGotenberg.tag | quote }}
         pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
       replicaCount: {{ .Values.replicas.openxchangeGotenberg }}
-      podAnnotations: {}
+      podAnnotations:
+        {{ .Values.annotations.openxchangeAppsuiteCoreMw.gotenbergPod | toYaml | nindent 8 }}
       resources:
         {{ .Values.resources.openxchangeGotenberg | toYaml | nindent 8 }}
       securityContext:
@@ -179,14 +277,16 @@ appsuite:
     packages:
       status:
         {{- if .Values.functional.migration.oxAppSuite.enabled }}
-        open-xchange-authentication-masterpassword: "enabled"
-        open-xchange-authentication-ldap: "disabled"
-        open-xchange-authentication-oauth: "disabled"
         open-xchange-oidc: "disabled"
+        open-xchange-authentication-oauth: "disabled"
+        open-xchange-authentication-masterpassword: "enabled"
+        open-xchange-authentication-database: "disabled"
+        open-xchange-authentication-ldap: "disabled"
         {{- else }}
         open-xchange-oidc: "enabled"
-        open-xchange-authentication-database: "disabled"
         open-xchange-authentication-oauth: "enabled"
+        open-xchange-authentication-masterpassword: "disabled"
+        open-xchange-authentication-database: "disabled"
         open-xchange-authentication-ldap: "disabled"
         {{- end }}
         # OX Documents (office-web) is not used in openDesk
@@ -237,25 +337,12 @@ appsuite:
       com.openexchange.authentication.oauth.clientSecret: {{ .Values.secrets.keycloak.clientSecret.as8oidc | quote }}
       # MAIL
       com.openexchange.mail.authType: "xoauth2"
-      com.openexchange.mail.loginSource: "name"
+      com.openexchange.mail.loginSource: "mail"
       com.openexchange.mail.mailServer: "dovecot"
       com.openexchange.mail.mailServerSource: "global"
       com.openexchange.mail.transport.authType: "xoauth2"
       com.openexchange.mail.transportServer: "postfix-ox"
       com.openexchange.mail.transportServerSource: "global"
-      # Mail Login Resolver
-      com.openexchange.mail.login.resolver.enabled: "true"
-      com.openexchange.mail.login.resolver.ldap.enabled: "true"
-      com.openexchange.mail.login.resolver.ldap.clientId: contactsLdapClient
-      com.openexchange.mail.login.resolver.ldap.mailLoginSearchFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(mailPrimaryAddress=[mailLogin]))"
-      com.openexchange.mail.login.resolver.ldap.userNameAttribute: uid
-      com.openexchange.mail.login.resolver.ldap.contextIdAttribute: oxContextIDNum
-      com.openexchange.mail.login.resolver.ldap.entitySearchFilter: "(&(univentionObjectType=users/user)(isOxUser=OK)(oxContextIDNum=[cid])(uid=[uname]))"
-      #com.openexchange.mail.login.resolver.ldap.mailLoginAttribute: entryUUID
-      # Workaround until either OX issue /appsuite/platform/core#251 is fixed
-      # or entryUUIDs are replaced by a different field.
-      com.openexchange.mail.login.resolver.ldap.mailLoginAttribute: departmentName
-      #com.openexchange.mail.login.resolver.ldap.cacheExpire: "1"
       # Requirements for OX-Connector
       com.openexchange.user.enforceUniqueDisplayName: "false"
       com.openexchange.folderstorage.database.preferDisplayName: "false"
@@ -343,8 +430,10 @@ appsuite:
       com.openexchange.share.cryptKey: {{ .Values.secrets.oxAppSuite.shareCryptKey | quote }}
       com.openexchange.conference.element.authToken: {{ .Values.secrets.oxAppSuite.synapseAsToken | quote }}
     propertiesFiles:
+      {{- if .Values.functional.migration.oxAppSuite.enabled }}
       /opt/open-xchange/etc/masterpassword-authentication.properties:
         com.openexchange.authentication.masterpassword.password: {{ .Values.secrets.oxAppSuite.migrationsMasterPassword | quote }}
+      {{- end }}
       /opt/open-xchange/etc/AdminDaemon.properties:
         MASTER_ACCOUNT_OVERRIDE: "true"
       /opt/open-xchange/etc/AdminUser.properties:
@@ -434,6 +523,8 @@ appsuite:
     # podSecurityContext: {}
     # securityContext: {}
     update:
+      podAnnotations:
+        {{ .Values.annotations.openxchangeAppsuiteCoreMw.updatePod | toYaml | nindent 8 }}
       image:
         repository: {{ .Values.images.openxchangeCoreMW.repository | quote }}
         tag: {{ .Values.images.openxchangeCoreMW.tag | quote }}
@@ -460,7 +551,8 @@ appsuite:
       tag: {{ .Values.images.openxchangeCoreUI.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUI }}
-    podAnnotations: {}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreUi.pod | toYaml | nindent 6 }}
     resources:
       {{ .Values.resources.openxchangeCoreUI | toYaml | nindent 6 }}
     securityContext:
@@ -496,7 +588,8 @@ appsuite:
       tag: {{ .Values.images.openxchangeCoreUIMiddleware.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
     overrides: {}
-    podAnnotations: {}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreUiMiddleware.pod | toYaml | nindent 6 }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreUIMiddleware }}
     resources:
@@ -539,7 +632,10 @@ appsuite:
       repository: {{ .Values.images.openxchangeDocumentConverter.repository | quote }}
       tag: {{ .Values.images.openxchangeDocumentConverter.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations: {}
+    {{- if .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod }}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreDocumentconverter.pod | toYaml | nindent 6 }}
+    {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreDocumentConverter }}
     resources:
@@ -589,7 +685,8 @@ appsuite:
       repository: {{ .Values.images.openxchangeCoreGuidedtours.repository | quote }}
       tag: {{ .Values.images.openxchangeCoreGuidedtours.tag | quote }}
       pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-    podAnnotations: {}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreGuidedtours.pod | toYaml | nindent 6 }}
     replicaCount: {{ .Values.replicas.openxchangeCoreGuidedtours }}
     resources:
       {{- .Values.resources.openxchangeCoreGuidedtours | toYaml | nindent 6 }}
@@ -627,7 +724,10 @@ appsuite:
           endpoint: "."
           accessKey: "."
           secretKey: "."
-    podAnnotations: {}
+    {{- if .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod }}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreImageconverter.pod | toYaml | nindent 6 }}
+    {{- end }}
     redis: *redisConfiguration
     replicaCount: {{ .Values.replicas.openxchangeCoreImageConverter }}
     resources:
@@ -696,7 +796,8 @@ appsuite:
     {{- range .Values.global.imagePullSecrets }}
       - name: {{ . | quote }}
     {{- end }}
-    podAnnotations: {}
+    podAnnotations:
+      {{ .Values.annotations.openxchangeAppsuiteCoreUserGuide.pod | toYaml | nindent 6 }}
     replicaCount: {{ .Values.replicas.openxchangeCoreUserGuide }}
     resources:
       {{- .Values.resources.openxchangeCoreUserGuide | toYaml | nindent 6 }}

helmfile/apps/open-xchange/values-oxconnector.yaml.gotmpl

@@ -69,7 +69,8 @@ persistence:
   size: {{ .Values.persistence.storages.oxConnector.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.oxConnector.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.nubusOxConnector.pod | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.oxConnector }}
 
@@ -92,6 +93,8 @@ securityContext:
     {{ .Values.seLinuxOptions.oxConnector | toYaml | nindent 4 }}
 
 serviceAccount:
+  annotations:
+    {{ .Values.annotations.nubusOxConnector.serviceAccount | toYaml | nindent 4 }}
   create: true
 
 ...

helmfile/apps/open-xchange/values-postfix.yaml.gotmpl

@@ -57,7 +57,7 @@ postfix:
   {{- end }}
   rspamdHost: ""
   relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
-  relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
+  allowRelayNets: false
   smtpSASLAuthEnable: "yes"
   smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"
   smtpTLSSecurityLevel: "encrypt"
@@ -84,7 +84,8 @@ postfix:
   virtualMailboxDomains: {{ if .Values.global.additionalMailDomains }}{{ printf "%s,%s" (.Values.global.mailDomain | default .Values.global.domain) .Values.global.additionalMailDomains }}{{ else }}{{ .Values.global.mailDomain | default .Values.global.domain | quote }}{{ end }}
   virtualTransport: "lmtps:dovecot:24"
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.openxchangePostfix.pod | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.postfix }}
 
@@ -93,6 +94,8 @@ resources:
 
 {{- if or (eq (coalesce .Values.service.type.postfix .Values.cluster.service.type) "NodePort") (eq (coalesce .Values.service.type.postfix .Values.cluster.service.type) "LoadBalancer") }}
 service:
+  annotations:
+    {{ .Values.annotations.openxchangePostfix.service | toYaml | nindent 4 }}
   external:
     enabled: true
     type: {{ coalesce .Values.service.type.postfix .Values.cluster.service.type | quote }}

helmfile/apps/opendesk-migrations-post/values.yaml.gotmpl

@@ -3,7 +3,15 @@
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
-podAnnotations: {}
+additionalAnnotations:
+  {{ .Values.annotations.opendeskMigrationsPost.additional | toYaml | nindent 2 }}
+
+podAnnotations:
+  {{ .Values.annotations.opendeskMigrationsPost.pod | toYaml | nindent 2 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.opendeskMigrationsPost.serviceAccount | toYaml | nindent 4 }}
 
 migrations:
   stage: "POST"

helmfile/apps/opendesk-migrations-pre/values.yaml.gotmpl

@@ -3,7 +3,15 @@
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
-podAnnotations: {}
+additionalAnnotations:
+  {{ .Values.annotations.opendeskMigrationsPre.additional | toYaml | nindent 2 }}
+
+podAnnotations:
+  {{ .Values.annotations.opendeskMigrationsPre.pod | toYaml | nindent 2 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.opendeskMigrationsPre.serviceAccount | toYaml | nindent 4 }}
 
 migrations:
   stage: "PRE"

helmfile/apps/opendesk-openproject-bootstrap/values.yaml.gotmpl

@@ -11,6 +11,9 @@ global:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
+additionalAnnotations:
+  {{ .Values.annotations.openprojectBootstrap.additional | toYaml | nindent 2 }}
+
 cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
   deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
@@ -72,6 +75,9 @@ image:
 job:
   enabled: true
 
+podAnnotations:
+  {{ .Values.annotations.openprojectBootstrap.pod | toYaml | nindent 2 }}
+
 podSecurityContext:
   enabled: true
   fsGroup: 1000

helmfile/apps/opendesk-services/values-home.yaml.gotmpl

@@ -3,6 +3,9 @@ SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlic
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.opendeskServicesHome.additional | toYaml | nindent 2 }}
+
 global:
   domain: {{ .Values.global.domain | quote }}
   hosts:
@@ -12,4 +15,6 @@ ingress:
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
   tls:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.opendeskServicesHome.ingress | toYaml | nindent 4 }}
 ...

helmfile/apps/opendesk-services/values-opendesk-static-files.yaml.gotmpl

@@ -10,6 +10,9 @@ global:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
+additionalAnnotations:
+  {{ .Values.annotations.opendeskServicesStaticFiles.additional | toYaml | nindent 2 }}
+
 assets:
   element:
     subdomain: {{ .Values.global.hosts.element }}
@@ -96,6 +99,8 @@ ingress:
   host: "{{ .Values.global.hosts.static }}.{{ .Values.global.domain }}"
   tls:
     secretName: {{ .Values.ingress.tls.secretName | quote }}
+  annotations:
+    {{ .Values.annotations.opendeskServicesStaticFiles.ingress | toYaml | nindent 4 }}
 
 image:
   registry: {{ coalesce .Values.repositories.image.dockerHub .Values.global.imageRegistry .Values.images.opendeskStaticFiles.registry | quote }}
@@ -103,6 +108,8 @@ image:
   tag: {{ .Values.images.opendeskStaticFiles.tag | quote }}
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
+podAnnotations:
+  {{ .Values.annotations.opendeskServicesStaticFiles.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -116,4 +123,11 @@ resources:
 
 service:
   type: "ClusterIP"
+  annotations:
+    {{ .Values.annotations.opendeskServicesStaticFiles.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.opendeskServicesStaticFiles.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl

@@ -8,6 +8,9 @@ global:
   hosts:
     {{ .Values.global.hosts | toYaml | nindent 4 }}
 
+additionalAnnotations:
+  {{ .Values.annotations.opendeskServicesOtterize.additional | toYaml | nindent 2 }}
+
 apps:
   clamavDistributed:
     enabled: {{ .Values.apps.clamavDistributed.enabled }}

helmfile/apps/openproject/values.yaml.gotmpl

@@ -131,7 +131,8 @@ memcached:
 persistence:
   enabled: false
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.openproject.pod | toYaml | nindent 2 }}
 
 postgresql:
   bundled: false
@@ -179,6 +180,12 @@ openproject:
       login: "opendesk_username"
       admin: "openproject_admin"
   useTmpVolumes: true
+  tmpVolumesAnnotations:
+    {{ .Values.annotations.openproject.openprojectTempVolumes | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.openproject.serviceAccount | toYaml | nindent 4 }}
 
 ingress:
   annotations:
@@ -188,6 +195,9 @@ ingress:
     nginx.org/client-max-body-size: "{{ .Values.ingress.parameters.bodySize.openproject }}"
     nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.openproject }}s"
     nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.openproject }}s"
+    {{- with .Values.annotations.openproject.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   host: "{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}"
   enabled: {{ .Values.ingress.enabled }}
   ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
@@ -221,6 +231,9 @@ seederJob:
     intents.otterize.com/service-name: "openproject-seeder"
     argocd.argoproj.io/hook: "Sync"
     argocd.argoproj.io/hook-delete-policy: "HookSucceeded"
+    {{- with .Values.annotations.openproject.seederJob }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   resources:
     {{ .Values.resources.openprojectSeederJob | toYaml | nindent 4 }}
 

helmfile/apps/services-external/values-cassandra.yaml.gotmpl

@@ -33,6 +33,10 @@ image:
   tag: {{ .Values.images.cassandra.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
+ingress:
+  annotations:
+    {{ .Values.annotations.cassandra.ingress | toYaml | nindent 6 }}
+
 initDB:
   initUserData.cql: >
     CREATE KEYSPACE IF NOT EXISTS {{ .Values.databases.dovecotDictmap.name | quote }} WITH REPLICATION = { 'class' : 'SimpleStrategy', 'replication_factor' : 1 };
@@ -70,7 +74,8 @@ persistence:
   size: {{ .Values.persistence.storages.cassandra.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.cassandra.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.cassandra.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -92,6 +97,10 @@ replicaCount: {{ .Values.replicas.cassandra }}
 resources:
   {{ .Values.resources.cassandra | toYaml | nindent 2 }}
 
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.cassandra.serviceAccount | toYaml | nindent 4 }}
+
 startupProbe:
   enabled: false
   initialDelaySeconds: 0

helmfile/apps/services-external/values-clamav-distributed.yaml.gotmpl

@@ -5,6 +5,8 @@ SPDX-License-Identifier: Apache-2.0
 */}}
 ---
 clamd:
+  commonAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.clamdCommon | toYaml | nindent 4 }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -25,7 +27,8 @@ clamd:
     repository: {{ .Values.images.clamd.repository | quote }}
     tag: {{ .Values.images.clamd.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.clamdPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -33,6 +36,13 @@ clamd:
   replicaCount: {{ .Values.replicas.clamd }}
   resources:
     {{ .Values.resources.clamd | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.clamdService | toYaml | nindent 6 }}
+
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.clamdServiceAccount | toYaml | nindent 6 }}
 
 containerSecurityContext:
   allowPrivilegeEscalation: false
@@ -50,6 +60,8 @@ containerSecurityContext:
     {{ .Values.seLinuxOptions.clamav | toYaml | nindent 4 }}
 
 freshclam:
+  commonAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamCommon | toYaml | nindent 4 }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -70,7 +82,8 @@ freshclam:
     repository: {{ .Values.images.freshclam.repository | quote }}
     tag: {{ .Values.images.freshclam.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.freshclamPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -78,6 +91,9 @@ freshclam:
   replicaCount: {{ .Values.replicas.freshclam }}
   resources:
     {{ .Values.resources.freshclam | toYaml | nindent 4 }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.freshclamServiceAccount | toYaml | nindent 6 }}
   settings:
     database:
       auth:
@@ -92,6 +108,8 @@ global:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
 
 icap:
+  commonAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.icapCommon | toYaml | nindent 4 }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -112,7 +130,8 @@ icap:
     repository: {{ .Values.images.icap.repository | quote }}
     tag: {{ .Values.images.icap.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.icapPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -120,8 +139,17 @@ icap:
   replicaCount: {{ .Values.replicas.icap }}
   resources:
     {{ .Values.resources.icap | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.icapService | toYaml | nindent 6 }}
+
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.icapServiceAccount | toYaml | nindent 6 }}
 
 milter:
+  commonAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.milterCommon | toYaml | nindent 4 }}
   containerSecurityContext:
     allowPrivilegeEscalation: false
     capabilities:
@@ -142,7 +170,8 @@ milter:
     repository: {{ .Values.images.milter.repository | quote }}
     tag: {{ .Values.images.milter.tag | quote }}
     imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
-  podAnnotations: {}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.milterPod | toYaml | nindent 4 }}
   podSecurityContext:
     enabled: true
     fsGroup: 101
@@ -150,8 +179,17 @@ milter:
   replicaCount: {{ .Values.replicas.milter }}
   resources:
     {{ .Values.resources.milter | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.milterService | toYaml | nindent 6 }}
+
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalClamavDistributed.milterServiceAccount | toYaml | nindent 6 }}
 
 persistence:
   size: {{ .Values.persistence.storages.clamav.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.clamav.storageClassName .Values.persistence.storageClassNames.RWX | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalClamavDistributed.persistence | toYaml | nindent 4 }}
 ...

helmfile/apps/services-external/values-clamav-simple.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalClamavSimple.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -39,8 +42,11 @@ image:
 persistence:
   size: {{ .Values.persistence.storages.clamav.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.clamav.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalClamavSimple.persistence | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.servicesExternalClamavSimple.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -62,4 +68,13 @@ settings:
         url: {{ .Values.repositories.clamav.mirror.url | quote }}
       customURLs:
         {{ .Values.repositories.clamav.customURLs | toYaml | nindent 8 }}
+
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalClamavSimple.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalClamavSimple.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/services-external/values-dkimpy.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+additionalAnnotations:
+  {{ .Values.annotations.servicesExternalDkimpy.additional | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: true
   capabilities: {}
@@ -28,6 +31,9 @@ image:
   tag: {{ .Values.images.dkimpy.tag | quote }}
   imagePullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
+podAnnotations:
+  {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 2 }}
+
 podSecurityContext:
   enabled: true
   fsGroup: 1000
@@ -44,4 +50,13 @@ replicaCount: {{ .Values.replicas.dkimpy }}
 
 resources:
   {{ .Values.resources.dkimpy | toYaml | nindent 2 }}
+
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalDkimpy.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalDkimpy.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/services-external/values-mariadb.yaml.gotmpl

@@ -8,6 +8,9 @@ cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
   deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalMariadb.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -73,10 +76,15 @@ mariadb:
 persistence:
   size: {{ .Values.persistence.storages.mariadb.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.mariadb.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalMariadb.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
+  {{- with .Values.annotations.servicesExternalMariadb.pod }}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 podSecurityContext:
   enabled: true
@@ -88,4 +96,12 @@ replicaCount: {{ .Values.replicas.mariadb }}
 resources:
   {{ .Values.resources.mariadb | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalMariadb.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalMariadb.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/services-external/values-memcached.yaml.gotmpl

@@ -6,6 +6,9 @@ SPDX-License-Identifier: Apache-2.0
 ---
 architecture: {{ if gt .Values.replicas.memcached 1 }}"high-availability"{{ else }}"standalone"{{ end }}
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalMemcached.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -32,13 +35,21 @@ image:
   tag: {{ .Values.images.memcached.tag | quote }}
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.servicesExternalMemcached.pod | toYaml | nindent 2 }}
 
 replicaCount: {{ .Values.replicas.memcached }}
 
 resources:
   {{ .Values.resources.memcached | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalMemcached.service | toYaml | nindent 4 }}
+
 serviceAccount:
   create: true
+  annotations:
+    {{ .Values.annotations.servicesExternalMemcached.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/services-external/values-minio.yaml.gotmpl

@@ -15,10 +15,16 @@ apiIngress:
   annotations:
     nginx.ingress.kubernetes.io/proxy-body-size: "4G"
     nginx.org/client-max-body-size: "4G"
+    {{- with .Values.annotations.servicesExternalMinio.apiIngress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
 
 auth:
   rootPassword: {{ .Values.secrets.minio.rootPassword | quote }}
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalMinio.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   enabled: true
   allowPrivilegeEscalation: false
@@ -66,6 +72,9 @@ ingress:
       secretName: "{{ .Values.ingress.tls.secretName }}"
   annotations:
     nginx.org/websocket-services: "minio"
+    {{- with .Values.annotations.servicesExternalMinio.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
 {{- end }}
 
 livenessProbe:
@@ -92,6 +101,8 @@ podSecurityContext:
 persistence:
   size: {{ .Values.persistence.storages.minio.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.minio.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalMinio.persistence | toYaml | nindent 4 }}
 
 provisioning:
   enabled: true
@@ -121,6 +132,8 @@ provisioning:
       versioning: "Suspended"
       withLock: false
     {{- end }}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalMinio.provisioningPod | toYaml | nindent 4 }}
   policies:
     - name: "migrations-bucket-policy"
       statements:
@@ -238,7 +251,8 @@ provisioning:
   resources:
     {{ .Values.resources.minio | toYaml | nindent 4 }}
 
-podAnnotations: {}
+podAnnotations:
+  {{ .Values.annotations.servicesExternalMinio.pod | toYaml | nindent 2 }}
 
 readinessProbe:
   enabled: true
@@ -249,6 +263,17 @@ readinessProbe:
 resources:
   {{ .Values.resources.minio | toYaml | nindent 2 }}
 
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalMinio.serviceService | toYaml | nindent 4 }}
+  headless:
+    annotations:
+      {{ .Values.annotations.servicesExternalMinio.serviceHeadless | toYaml | nindent 6 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalMinio.serviceAccount | toYaml | nindent 4 }}
+
 startupProbe:
   enabled: true
   periodSeconds: 10

helmfile/apps/services-external/values-postfix.yaml.gotmpl

@@ -9,6 +9,9 @@ certificate:
   request:
     enabled: false
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalPostfix.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: true
   capabilities: {}
@@ -36,6 +39,11 @@ image:
 persistence:
   size: {{ .Values.persistence.storages.postfix.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.postfix.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalPostfix.persistence | toYaml | nindent 4 }}
+
+podAnnotations:
+  {{ .Values.annotations.servicesExternalPostfix.pod | toYaml | nindent 2 }}
 
 podSecurityContext:
   enabled: true
@@ -58,6 +66,7 @@ postfix:
   rspamdHost: ""
   relayHost: {{ if .Values.smtp.host }}{{ printf "[%s]:%d" .Values.smtp.host .Values.smtp.port | quote }}{{ else }}""{{ end }}
   relayNets: {{ join " " .Values.cluster.networking.cidr | quote }}
+  allowRelayNets: true
   smtpSASLAuthEnable: "yes"
   smtpSASLPasswordMaps: "lmdb:/etc/postfix/sasl_passwd.map"
   smtpTLSSecurityLevel: "encrypt"
@@ -99,6 +108,12 @@ resources:
   {{ .Values.resources.postfix | toYaml | nindent 2 }}
 
 service:
+  annotations:
+    {{ .Values.annotations.servicesExternalPostfix.service | toYaml | nindent 4 }}
   external:
     enabled: false
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalPostfix.serviceAccount | toYaml | nindent 4 }}
 ...

helmfile/apps/services-external/values-postgresql.yaml.gotmpl

@@ -8,6 +8,9 @@ cleanup:
   deletePodsOnSuccess: {{ .Values.debug.cleanup.deletePodsOnSuccess }}
   deletePodsOnSuccessTimeout: {{ .Values.debug.cleanup.deletePodsOnSuccessTimeout }}
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalPostgresql.common | toYaml | nindent 2 }}
+
 containerSecurityContext:
   allowPrivilegeEscalation: false
   capabilities:
@@ -110,10 +113,15 @@ job:
 persistence:
   size: {{ .Values.persistence.storages.postgresql.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.postgresql.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
+  annotations:
+    {{ .Values.annotations.servicesExternalPostgresql.persistence | toYaml | nindent 4 }}
 
 podAnnotations:
   argocd.argoproj.io/hook: "PostSync"
   argocd.argoproj.io/hook-delete-policy: "BeforeHookCreation"
+  {{- with .Values.annotations.servicesExternalPostgresql.pod}}
+  {{ . | toYaml | nindent 2 }}
+  {{- end }}
 
 postgres:
   user: "postgres"
@@ -121,4 +129,13 @@ postgres:
 
 resources:
   {{ .Values.resources.postgresql | toYaml | nindent 2 }}
+
+service:
+  annotations:
+    {{ .Values.annotations.servicesExternalPostgresql.service | toYaml | nindent 4 }}
+
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.servicesExternalPostgresql.serviceAccount | toYaml | nindent 4 }}
+
 ...

helmfile/apps/services-external/values-redis.yaml.gotmpl

@@ -9,6 +9,9 @@ architecture: "standalone"
 auth:
   password: {{ .Values.secrets.redis.password | quote }}
 
+commonAnnotations:
+  {{ .Values.annotations.servicesExternalRedis.common | toYaml | nindent 2 }}
+
 global:
   imagePullSecrets:
     {{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
@@ -21,6 +24,8 @@ image:
   pullPolicy: {{ .Values.global.imagePullPolicy | quote }}
 
 master:
+  annotations:
+    {{ .Values.annotations.servicesExternalRedis.masterMaster | toYaml | nindent 4 }}
   containerSecurityContext:
     privileged: false
     readOnlyRootFilesystem: true
@@ -38,13 +43,40 @@ master:
   count: {{ .Values.replicas.redis }}
   persistence:
     size: {{ .Values.persistence.storages.redis.size | quote }}
-  podAnnotations: {}
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.masterPersistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalRedis.masterPod | toYaml | nindent 4 }}
   resources:
     {{ .Values.resources.redis | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.masterService | toYaml | nindent 6 }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.masterServiceAccount | toYaml | nindent 6 }}
 
 metrics:
   enabled: false
 
+replica:
+  annotations:
+    {{ .Values.annotations.servicesExternalRedis.replicaReplica | toYaml | nindent 4 }}
+  persistence:
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.replicaPersistence | toYaml | nindent 6 }}
+  podAnnotations:
+    {{ .Values.annotations.servicesExternalRedis.replicaPod | toYaml | nindent 4 }}
+  service:
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.replicaService | toYaml | nindent 6 }}
+  serviceAccount:
+    annotations:
+      {{ .Values.annotations.servicesExternalRedis.replicaServiceAccount | toYaml | nindent 6 }}
+
+secretAnnotations:
+  {{ .Values.annotations.servicesExternalRedis.secret | toYaml | nindent 2 }}
+
 sentinel:
   enabled: false
 

helmfile/apps/xwiki/values.yaml.gotmpl

@@ -4,6 +4,9 @@ SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG Ze
 SPDX-License-Identifier: Apache-2.0
 */}}
 ---
+commonAnnotations:
+  {{ .Values.annotations.xwiki.common | toYaml | nindent 2 }}
+
 image:
   {{- if eq .Values.databases.xwiki.type "mariadb" }}
   name: "{{ coalesce .Values.repositories.image.registryOpencodeDe .Values.global.imageRegistry .Values.images.xwikiMariadb.registry }}/{{ .Values.images.xwikiMariadb.repository }}"
@@ -129,6 +132,9 @@ ingress:
     nginx.org/proxy-read-timeout: "{{ .Values.ingress.parameters.bodyTimeout.xwiki }}s"
     nginx.org/proxy-send-timeout: "{{ .Values.ingress.parameters.bodyTimeout.xwiki }}s"
     haproxy-ingress.github.io/headers: "X-Forwarded-Host {{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
+    {{- with .Values.annotations.xwiki.ingress }}
+    {{ . | toYaml | nindent 4 }}
+    {{- end }}
   hosts:
     - host: "{{ .Values.global.hosts.xwiki }}.{{ .Values.global.domain }}"
       paths:
@@ -149,6 +155,8 @@ mysql:
   enabled: false
 
 persistence:
+  annotations:
+    {{ .Values.annotations.xwiki.persistence | toYaml | nindent 4 }}
   size: {{ .Values.persistence.storages.xwiki.size | quote }}
   storageClass: {{ coalesce .Values.persistence.storages.xwiki.storageClassName .Values.persistence.storageClassNames.RWO | quote }}
 
@@ -217,9 +225,15 @@ resources:
   {{ .Values.resources.xwiki | toYaml | nindent 2 }}
 
 service:
+  annotations:
+    {{ .Values.annotations.xwiki.service | toYaml | nindent 4 }}
   externalPort: 80
   enabled: true
 
+serviceAccount:
+  annotations:
+    {{ .Values.annotations.xwiki.serviceAccount | toYaml | nindent 4 }}
+
 volumePermissions:
   enabled: true
 

helmfile/environments/default-enterprise-overrides/charts.yaml.gotmpl

@@ -6,7 +6,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/product-development/charts/opendesk-dovecot-pro"
     name: "dovecot"
-    version: "2.0.2"
+    version: "2.0.3"
     verify: true
   oxAppSuite:
     registry: "registry.opencode.de"

helmfile/environments/default-enterprise-overrides/images.yaml.gotmpl

@@ -5,7 +5,7 @@ images:
   collabora:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "24.04.12.4.1@sha256:af4d4d0e743c71f7995e81cb081d0e1db79d016b0c50169480096f70b4b42f85"
+    tag: "24.04.13.3.1@sha256:7e9b63972415a5a8006ec6b7e904c2d78d9af467218ead7e578d0c8a5691f0bc"
   dovecot:
     registry: "registry.opencode.de"
     repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/dovecot-pro"
@@ -16,6 +16,6 @@ images:
     tag: "1.1.9@sha256:ad28c9dd8cdb4bdd325fe132215d0cf094392c3ddd1f114707b09bb7d1c61a9e"
   openxchangeCoreMW:
     registry: "registry.opencode.de"
-    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/core-mw"
+    repository: "zendis/opendesk-enterprise/components/supplier/open-xchange/images-mirror/middleware-public-sector-pro"
     tag: "8.35.85@sha256:54d01a16ea29a3ae8f1857e5bdf6d2e34046b8a3fa3d6179bb3ad3d047e1318f"
 ...

helmfile/environments/default/annotations.yaml.gotmpl

@@ -0,0 +1,440 @@
+# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH
+# SPDX-License-Identifier: Apache-2.0
+---
+annotations:
+  cassandra:
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  coco:
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  collabora:
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  cryptpad:
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  element:
+    common: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixNeoboardWidget:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixNeochoiceWidget:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixNeodatefixBot:
+    additional: ~
+    ingress: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixNeodatefixBotBootstrap:
+    pod: ~
+    serviceAccount: ~
+  elementMatrixNeodatefixWidget:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixUserVerificationService:
+    additional: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementMatrixUserVerificationServiceBootstrap:
+    pod: ~
+    serviceAccount: ~
+  elementSynapse:
+    common: ~
+    federationIngress: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementSynapseWeb:
+    common: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  elementWellKnown:
+    common: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  jitsi:
+    pod: ~
+    serviceAccount: ~
+  jitsiGlobal:
+    pod: ~
+  jitsiJibri:
+    pod: ~
+  jitsiJicofo:
+    pod: ~
+  jitsiJigasi:
+    pod: ~
+  jitsiJitsiPatchJVB:
+    serviceAccount: ~
+  jitsiJvb:
+    pod: ~
+    service: ~
+    metricsPrometheus: ~
+    metricsGrafana: ~
+  jitsiProsody:
+    pod: ~
+  jitsiWeb:
+    ingress: ~
+    pod: ~
+  nextcloudAio:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nextcloudExporter:
+    additional: ~
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  nextcloudNextcloudMgmt:
+    additional: ~
+    pod: ~
+    serviceAccount: ~
+  notes:
+    ingressAdmin: ~
+    ingressCollaborationWS: ~
+    ingressCollaborationAPI: ~
+    ingressMedia: ~
+    serviceMedia: ~
+  notesBackend:
+    migrateJob: ~
+    pod: ~
+    service: ~
+  notesFrontend:
+    pod: ~
+    service: ~
+  notesYProvider:
+    pod: ~
+    service: ~
+  nubus:
+    additional: ~
+    ingress: ~
+  nubusGuardian:
+    authorizationApiPod: ~
+    globalPod: ~
+    ingressIngress: ~
+    ingressManagementUi: ~
+    ingressManagementApi: ~
+    ingressAuthorizationApi: ~
+    managementApiPod: ~
+    managementUiPod: ~
+    serviceAccount: ~
+  nubusIntercomService:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusKeycloak:
+    common: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusKeycloakBootstrap:
+    additional: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusKeycloakBootstrapNubus:
+    additional: ~
+    pod: ~
+    serviceAccount: ~
+  nubusKeycloakExtensions:
+    handlerAdditional: ~
+    handlerPod: ~
+    handlerService: ~
+    handlerServiceAccount: ~
+    proxyAdditional: ~
+    proxyIngress: ~
+    proxyPod: ~
+    proxyService: ~
+    proxyServiceAccount: ~
+  nubusLdapNotifier:
+    additional: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusLdapServer:
+    additional: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusNotificationsApi:
+    additional: ~
+    ingress: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusOxConnector:
+    pod: ~
+    serviceAccount: ~
+  nubusPortalConsumer:
+    pod: ~
+  nubusPortalFrontend:
+    additional: ~
+    ingressIngress: ~
+    ingressRewrites: ~
+    ingressRedirects: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusPortalServer:
+    additional: ~
+    ingress: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusProvisioning:
+    additional: ~
+    apiAdditional: ~
+    apiPod: ~
+    dispatcherAdditional: ~
+    dispatcherPod: ~
+    natsAdditional: ~
+    natsPod: ~
+    udmTransformerAdditional: ~
+    udmTransformerPod: ~
+    pod: ~
+    prefillAdditional: ~
+    prefillPod: ~
+    registerConsumersAdditional: ~
+    registerConsumersPod: ~
+    service: ~
+    serviceAccount: ~
+  nubusNginxS3Gateway:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusSelfserviceConsumer:
+    pod: ~
+    serviceAccount: ~
+  nubusStackDataUms:
+    additional: ~
+    pod: ~
+    serviceAccount: ~
+  nubusUdmListener:
+    pod: ~
+    serviceAccount: ~
+  nubusUdmRestApi:
+    additional: ~
+    ingress: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  nubusUmcGateway:
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  nubusUmcServer:
+    additional: ~
+    ingress: ~
+    pod: ~
+    serviceAccount: ~
+  opendeskMigrationsPost:
+    additional: ~
+    pod: ~
+    serviceAccount: ~
+  opendeskMigrationsPre:
+    additional: ~
+    pod: ~
+    serviceAccount: ~
+  opendeskServicesHome:
+    additional: ~
+    ingress: ~
+  opendeskServicesOtterize:
+    additional: ~
+  opendeskServicesStaticFiles:
+    additional: ~
+    ingress: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  openproject:
+    ingress: ~
+    pod: ~
+    openprojectTempVolumes: ~
+    serviceAccount: ~
+    seederJob: ~
+  openprojectBootstrap:
+    additional: ~
+    pod: ~
+  openxchangeAppsuiteCoreDocumentconverter:
+    pod: ~
+  openxchangeAppsuiteCoreGuidedtours:
+    pod: ~
+  openxchangeAppsuiteCoreImageconverter:
+    pod: ~
+  openxchangeAppsuiteCoreUi:
+    pod: ~
+  openxchangeAppsuiteCoreUiMiddleware:
+    pod: ~
+  openxchangeAppsuiteCoreMw:
+    gotenbergPod: ~
+    pod: ~
+    serviceAccount: ~
+    updatePod: ~
+  openxchangeAppsuiteCoreUserGuide:
+    pod: ~
+  openxchangeAppsuiteIngress:
+    appsuitebase: ~
+    ingress: ~
+    rootredirect: ~
+    trailslash: ~
+    restRoutesAdmin: ~
+    restRoutesAdvertisement: ~
+    restRoutesChronos: ~
+    restRoutesPreliminary: ~
+    restRoutesUserfeedback: ~
+    staticRoutesServlet: ~
+    staticRoutesRealtime: ~
+    staticRoutesInfostore: ~
+    staticRoutesWebservices: ~
+    driveClientWindowsOxRoute: ~
+    guardApiRoute: ~
+    guardSupportApiRoute: ~
+    guardPgpRoute: ~
+    httpApiRoutesApi: ~
+    httpApiRoutesAjax: ~
+    httpApiRoutesAppsuiteApi: ~
+    httpApiRoutesAppRootApi: ~
+    rt2Route: ~
+    documentsHelpRoute: ~
+    driveHelpRoute: ~
+    coreHelpRoute: ~
+    officeWebRoute: ~
+    caldavWellKnownRedirect: ~
+    carddavWellKnownRedirect: ~
+    davInfostoreRoute: ~
+    davRootRoute: ~
+    wopiServerRoute: ~
+  openxchangeBootstrap:
+    additional: ~
+    serviceAccount: ~
+  openxchangeDovecot:
+    common: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  openxchangeEnterpriseContactPicker:
+    appsuiteCoreMw:
+    appsuiteCoreMwPod: ~
+    appsuiteCoreMwServiceAccount: ~
+  openxchangeNextcloudIntegrationUi:
+    pod: ~
+  openxchangePostfix:
+    pod: ~
+    service: ~
+  openxchangePublicSectorUi:
+    pod: ~
+  servicesExternalClamavDistributed:
+    clamdCommon: ~
+    clamdPod: ~
+    clamdService: ~
+    clamdServiceAccount: ~
+    freshclamCommon: ~
+    freshclamService: ~
+    freshclamServiceAccount: ~
+    milterCommon: ~
+    milterPod: ~
+    milterService: ~
+    milterServiceAccount: ~
+    persistence: ~
+  servicesExternalClamavSimple:
+    common: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalDkimpy:
+    additional: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalMariadb:
+    common: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalMemcached:
+    common: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalMinio:
+    apiIngress: ~
+    common:
+    ingress: ~
+    persistence: ~
+    provisioningPod: ~
+    pod: ~
+    serviceService: ~
+    serviceHeadless: ~
+    serviceAccount: ~
+  servicesExternalPostfix:
+    common: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalPostgresql:
+    common: ~
+    persistence: ~
+    pod: ~
+    service: ~
+    serviceAccount: ~
+  servicesExternalRedis:
+    common: ~
+    masterMaster: ~
+    masterPersistence: ~
+    masterPod: ~
+    masterService: ~
+    masterServiceAccount: ~
+    replicaReplica: ~
+    replicaPersistence: ~
+    replicaPod: ~
+    replicaService: ~
+    replicaServiceAccount: ~
+    secret: ~
+  xwiki:
+    common: ~
+    ingress: ~
+    persistence: ~
+    service: ~
+    serviceAccount: ~
+...

helmfile/environments/default/charts.yaml.gotmpl

@@ -56,7 +56,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/collabora/charts-mirror"
     name: "collabora-online"
-    version: "1.1.21"
+    version: "1.1.37"
     verify: true
   collaboraController:
     # Enterprise Component
@@ -303,7 +303,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/charts-mirror"
     name: "nubus"
-    version: "1.7.0"
+    version: "1.8.0"
     verify: true
   opendeskAlerts:
     # providerCategory: "Platform"
@@ -333,7 +333,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-keycloak-bootstrap"
     name: "opendesk-keycloak-bootstrap"
-    version: "2.5.0"
+    version: "2.6.0"
     verify: true
   opendeskStaticFiles:
     # providerCategory: "Platform"
@@ -355,7 +355,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/openproject/charts-mirror"
     name: "openproject"
-    version: "9.8.3"
+    version: "9.9.0"
     verify: true
   openprojectBootstrap:
     # providerCategory: "Platform"
@@ -419,7 +419,7 @@ charts:
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/charts/opendesk-postfix"
     name: "postfix"
-    version: "3.0.0"
+    version: "3.0.1"
     verify: true
   postgresql:
     # providerCategory: "Platform"

helmfile/environments/default/functional.yaml.gotmpl

@@ -40,6 +40,27 @@ functional:
       clientSessionMaxLifespan: 0
       clientOfflineSessionIdleTimeout: 0
       clientOfflineSessionMaxLifespan: 0
+    # SSO federation allows an external OIDC IdP to authenticate users within openDesk
+    ssoFederation:
+      # Enabling SSO federation requires an upstream IdP specific configuration in `idpDetails` below.
+      enabled: false
+      # When enforcing the federated login all users are immediately redirected to the federated IdP when a login
+      # is requested or required.
+      enforceFederatedLogin: false
+      # Name of the SSO federation, if you do not enforce the login the name is shown as a login option the user can select
+      # within the openDesk login dialog.
+      name: "My upstream IdP"
+      # Configuration details for your upstream IdP, when you configured them manually in the Keycloak UI e.g. for
+      # testing the setup, you can get them from a Keycloak realm export in the `identityProviders` list.
+      # Notes:
+      # - You have to convert the configuration into YAML to apply it below.
+      # - You have to omit the following attributes as they are either defined explicitly above or implicitly by
+      #   the openDesk configuration
+      #  - `displayName`
+      #  - `alias`
+      #  - `firstBrokerLoginFlowAlias`
+      #  - `internalId`
+      idpDetails: {}
 
   externalServices:
     nubus:

helmfile/environments/default/global.generated.yaml.gotmpl

@@ -3,5 +3,5 @@
 ---
 global:
   systemInformation:
-    releaseVersion: "v1.2.1"
+    releaseVersion: "v1.3.2"
 ...

helmfile/environments/default/global.yaml.gotmpl

@@ -59,6 +59,7 @@ global:
     synapse: "matrix"
     synapseAdmin: "synapse-admin"
     synapseFederation: "matrix-federation"
+    twofaSelfservice: "twofa"
     whiteboard: "whiteboard"
     xwiki: "wiki"
 

helmfile/environments/default/images.yaml.gotmpl

@@ -44,7 +44,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/collabora/images/collabora-online-for-opendesk"
-    tag: "24.04.12.4.1@sha256:c794cefc3b56b13479e29626bb13e903ccc77a49163dacab1328efed69140c62"
+    tag: "24.04.13.3.1@sha256:f04a31d72b2b12b530b4e88b3ecb81eb96ebd98112515db59499ff71a4ec905f"
   collaboraController:
     # Enterprise Component
     # providerCategory: "Supplier"
@@ -303,7 +303,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
-    tag: "1.6.0@sha256:67ac4872f879b3ef3e27924754b3f89c6bdb158c22bd91c6c7c484aa2fed91ce"
+    tag: "1.6.1@sha256:cc97de002f5821e3b3751879514f3f45a3b4ffa851d999187c3cf3dd0dee82e7"
   milter:
     # providerCategory: "Community"
     # providerResponsible: "openDesk"
@@ -377,7 +377,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "41", "5"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/data-loader"
-    tag: "0.87.0@sha256:b45af938d7b0c3138054a859985e60c76c8a79caeb1dc31a6cd4189035bb07b7"
+    tag: "0.89.0@sha256:3ed16810357ed01152e1e3f0d1cd66825bde53302f32d3caf700e324f7c1cffb"
   nubusGuardianAuthorizationApi:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -417,7 +417,11 @@ images:
     # upstreamMirrorStartFrom: ["0", "3", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/guardian-init"
-    tag: "0.14.0@sha256:91613f123f7e46b321002d4b2b86c4635b79621376e513d4bea1bb1d01aa99f8"
+    tag: "0.17.0@sha256:56acfc53c3d3e0a20ff77fe427ae794adbf03ccc66972c95188e0da9e87c4a62"
+  nubusTwoFaSelfserviceProvisioning:
+    registry: "harbor-registry.atlantishq.de"
+    repository: "atlantishq/twofa-portal-extensions"
+    tag: "new7"
   nubusKeycloak:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -427,7 +431,7 @@ images:
     # upstreamMirrorStartFrom: ["22", "0", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak"
-    tag: "25.0.6-ucs5@sha256:8e9df64f9b6c5ce6e5f0ae732f0aadc928e13e7166236bd16bf647b92dad22bb"
+    tag: "25.0.6-ucs6@sha256:1db8af70741bca9badeb3d5b0b145244dde1a2579fe4f966e488ce730cb07d65"
   nubusKeycloakBootstrap:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -437,7 +441,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "1", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/keycloak-bootstrap"
-    tag: "0.7.1@sha256:1675e1615732914f01f832af7347c5913af51b447f7e5ca4bdd38557d798c52e"
+    tag: "0.10.2@sha256:7406bfee267dff6520b8b3c0db098a79e7f9fe1b45307ea6b1edf26a2bcfc1aa"
   nubusKeycloakExtensionHandler:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -467,7 +471,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "8", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-notifier"
-    tag: "0.33.0@sha256:1aed364bff3a5ce8fe6c19e6c8914a3243f7a0684c3ea9330fc61bcb6cbe4cac"
+    tag: "0.34.1@sha256:02d1a0d6ce7e154738f4a1c2323f901245b62c23c8e6c27ce19a57ab44cfdaa7"
   nubusLdapServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -477,7 +481,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "8", "2"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/ldap-server"
-    tag: "0.33.0@sha256:9354c79788ac48820ac781463e50f6ee315bf352b4ae384c3355124347953aa8"
+    tag: "0.34.1@sha256:5bb7931393d2023dc63c1338632b01d4c50372cb83192cdb329512b93e109984"
   nubusLdapServerDhInitContainer:
     # providerCategory: 'Community'
     # providerResponsible: 'Univention'
@@ -529,7 +533,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "4"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/notifications-api"
-    tag: "0.55.0@sha256:845d027becc48892314ed9bed4f2c78feaa63d632fcded2fe1cdc6458b1ba831"
+    tag: "0.63.0@sha256:4c2e01e609fb83df6d090c389b5c63d4b1477bdb133b910cacf2f2a1ce1c39e1"
   nubusOpendeskExtension:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -537,7 +541,7 @@ images:
     # upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/platform-development/images/opendesk-nubus"
-    tag: "1.12.8@sha256:9c5e06ed459c0b5f35e511c476b982b86466760bd3fe1617aa908fdcf9e389df"
+    tag: "1.13.1@sha256:eb96855b53241bcb1dd64d72d8c76f7ee080291da72e6dff39ed2fc81b8ac99b"
   nubusOpendeskExtensionA2gMapper:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"
@@ -575,7 +579,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "27", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-consumer"
-    tag: "0.55.0@sha256:919b4de5d2ef27e239f1d3e944ab58dfaa3e5ef52b865a31fe465da165b03eed"
+    tag: "0.63.0@sha256:e331f87738e716b0a16199b6aeaec917509946ce7b7ee91e608e70091dd279cc"
   nubusPortalExtension:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -585,7 +589,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "28", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-extension"
-    tag: "0.55.0@sha256:6f4fff6a53ffb8be858f3a06e9832b90f773500877dd8ab0e20da82008f3d964"
+    tag: "0.59.1@sha256:c9c7faa3cca2be2f45d073517a50e8a8cc89d46c978c2f3a6be3c13d0e6ae900"
   nubusPortalFrontend:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -603,7 +607,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "9", "4"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/portal-server"
-    tag: "0.55.0@sha256:bb9d73f1a75cf50073d7f8f8cfbeeecce930a7370cb80f1c543956aa669f7fd4"
+    tag: "0.63.0@sha256:04cff7bb6b565e4ff03ffd1a6b6ab6c76b98bb9ea0fb8e703551f1b586ea7c27"
   nubusProvisioningDispatcher:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -613,7 +617,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-dispatcher"
-    tag: "0.49.1@sha256:3ebc70a95749504f771e257187854d6bd3623fe9b0f8085aa4116e5290db9beb"
+    tag: "0.49.3@sha256:1089683a7e04259b335c79c13ceca2879d5d834a13d9c93ef62315f3086c9efd"
   nubusProvisioningEventsAndConsumerApi:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -623,7 +627,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-events-and-consumer-api"
-    tag: "0.49.1@sha256:8ad56dc861fa4880c100ba9efffe75398e8b077e4eeb673dadac34cfe44aa1ba"
+    tag: "0.49.3@sha256:56a5ca05a570f5a0f68ac67abbf8726541455f03bf0bada0495187d1a0fe963a"
   nubusProvisioningPrefill:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -633,7 +637,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-prefill"
-    tag: "0.49.1@sha256:3b3eac87ca6dd140236e8a36cd5b42efceb33013beb836f1caeff85ff700a570"
+    tag: "0.49.3@sha256:761863e5499eb702d0a606e9a58d10055c637ed286ff18998125cb5f82a7c788"
   nubusProvisioningUdmListener:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -643,7 +647,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-listener"
-    tag: "0.49.1@sha256:4534ec7c0ee1af3a1eabd4a39cc28c5ddc225e0c3a6bea31a0d6cdf6dcb11147"
+    tag: "0.49.3@sha256:9bd8dd7531e3247761a6347a1889640821121c56435a96c286d1f6385a3152e7"
   nubusProvisioningUdmTransformer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -653,7 +657,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "14", "0"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/provisioning-udm-transformer"
-    tag: "0.49.1@sha256:43f4636ed88333005570c97c51cf46deba499a25ffd65e993b37cf1418dfc483"
+    tag: "0.49.3@sha256:9ce6b3798fb6faba6ebfac1be19b51d12bc8b312decf87f482a2371cb961805e"
   nubusSelfServiceConsumer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -683,7 +687,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "7", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-gateway"
-    tag: "0.37.0@sha256:3ac0e34e9b1c353ab7778bae548804e3dcc236dd454c3f500de9795eb7dda947"
+    tag: "0.38.0@sha256:5abece086fc55cc318453a23634094bdf4e0f9922debce87fbb1aa4d55b9eac1"
   nubusUmcServer:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -693,7 +697,7 @@ images:
     # upstreamMirrorStartFrom: ["0", "7", "3"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/univention/images-mirror/umc-server"
-    tag: "0.37.0@sha256:ef06422cab2ab2bc4f84a13dfd7bfb7e862a3504f83fc6957fcbdfaa433d0468"
+    tag: "0.38.0@sha256:2733c21900c8f861f53cff5f65ed20a21881180ff80472491c014e1e2a9c2a9d"
   nubusUmcServerProxy:
     # providerCategory: "Supplier"
     # providerResponsible: "Univention"
@@ -737,7 +741,7 @@ images:
     # upstreamMirrorStartFrom: ["13", "1", "1"]
     registry: "registry.opencode.de"
     repository: "bmi/opendesk/components/supplier/openproject/images-mirror/open_desk"
-    tag: "15.4.2@sha256:d88df284e03b5c255ad3963ebe335f38a4e069754569dd47c5e92930e0b26a1b"
+    tag: "15.5.0@sha256:267f76694d0e86bc574035527b86b48ecc96c468bb6e7357d9edbc761b096969"
   openprojectBootstrap:
     # providerCategory: "Platform"
     # providerResponsible: "openDesk"

helmfile/files/theme/portal/stylesheet.css

@@ -136,13 +136,15 @@
 #kc-login,
 #kc-logout,
 #saveTOTPBtn,
-.pf-c-button.btn-lg,
+.pf-c-button.btn-lg {
-.kc-social-provider-name
+  color: var(--color-opendesk-white) !important;
-{
-  color: var(--color-opendesk-white);
   border: 2px solid;
 }
 
+.kc-social-provider-name {
+  color: var(--color-opendesk-white) !important;
+}
+
 #kc-login:hover,
 #kc-logout:hover,
 #saveTOTPBtn:hover,

publiccode.yml

@@ -22,8 +22,8 @@ name: "openDesk"
 platforms:
   - "web"
 developmentStatus: "stable"
-softwareVersion: "1.2.1"
+softwareVersion: "1.3.1"
-releaseDate: "2025-03-21"
+releaseDate: "2025-04-23"
 softwareType: "standalone/web"
 url: "https://gitlab.opencode.de/bmi/opendesk/"
 logo: "openDesk-logo-rgb-color.svg"