mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 23:41:43 +01:00
feat(open-xchange): Bump to 8.23 and remove Istio prerequisite
This commit is contained in:
@@ -32,7 +32,7 @@ openDesk currently features the following functional main components:
|
|||||||
| Chat & collaboration | Element ft. Nordeck widgets | [1.11.59](https://github.com/element-hq/element-desktop/releases/tag/v1.11.59) | [For the most recent release](https://element.io/user-guide) |
|
| Chat & collaboration | Element ft. Nordeck widgets | [1.11.59](https://github.com/element-hq/element-desktop/releases/tag/v1.11.59) | [For the most recent release](https://element.io/user-guide) |
|
||||||
| Diagram editor | Cryptpad ft. diagrams.net | [5.6.0](https://github.com/cryptpad/cryptpad/releases/tag/5.6.0) | [For the most recent release](https://docs.cryptpad.org/en/) |
|
| Diagram editor | Cryptpad ft. diagrams.net | [5.6.0](https://github.com/cryptpad/cryptpad/releases/tag/5.6.0) | [For the most recent release](https://docs.cryptpad.org/en/) |
|
||||||
| File management | Nextcloud | [28.0.4](https://nextcloud.com/de/changelog/#28-0-4) | [Nextcloud 28](https://docs.nextcloud.com/) |
|
| File management | Nextcloud | [28.0.4](https://nextcloud.com/de/changelog/#28-0-4) | [Nextcloud 28](https://docs.nextcloud.com/) |
|
||||||
| Groupware | OX Appsuite | [8.22](https://documentation.open-xchange.com/appsuite/releases/8.22/) | Online documentation available from within the installed application; [Additional resources](https://www.open-xchange.com/resources/oxpedia) |
|
| Groupware | OX App Suite | [8.23](https://documentation.open-xchange.com/appsuite/releases/8.23/) | Online documentation available from within the installed application; [Additional resources](https://www.open-xchange.com/resources/oxpedia) |
|
||||||
| Knowledge management | XWiki | [15.10.8](https://www.xwiki.org/xwiki/bin/view/Blog/XWiki15108Released) | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation) |
|
| Knowledge management | XWiki | [15.10.8](https://www.xwiki.org/xwiki/bin/view/Blog/XWiki15108Released) | [For the most recent release](https://www.xwiki.org/xwiki/bin/view/Documentation) |
|
||||||
| Portal & IAM | Nubus | Product Preview[^1] | [Univention's documentation website](https://docs.software-univention.de/n/en/index.html) |
|
| Portal & IAM | Nubus | Product Preview[^1] | [Univention's documentation website](https://docs.software-univention.de/n/en/index.html) |
|
||||||
| Project management | OpenProject | [13.4.1](https://www.openproject.org/docs/release-notes/13-4-1/) | [For the most recent release](https://www.openproject.org/docs/user-guide/) |
|
| Project management | OpenProject | [13.4.1](https://www.openproject.org/docs/release-notes/13-4-1/) | [For the most recent release](https://www.openproject.org/docs/user-guide/) |
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ The project includes a `.gitlab-ci.yml` that allows you to execute the deploymen
|
|||||||
When starting the pipeline through the Gitlab UI, you will be queried for some variables plus the following ones:
|
When starting the pipeline through the Gitlab UI, you will be queried for some variables plus the following ones:
|
||||||
|
|
||||||
- `DOMAIN` = The domain to deploy to.
|
- `DOMAIN` = The domain to deploy to.
|
||||||
- `ISTIO_DOMAIN` = istio.`DOMAIN`
|
|
||||||
- `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed
|
- `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed
|
||||||
- `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD`
|
- `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD`
|
||||||
|
|
||||||
|
|||||||
@@ -69,26 +69,12 @@ The domain have to be set either via `dev` environment
|
|||||||
```yaml
|
```yaml
|
||||||
global:
|
global:
|
||||||
domain: "my.open.desk"
|
domain: "my.open.desk"
|
||||||
istio:
|
|
||||||
domain: "istio.my.open.desk"
|
|
||||||
```
|
```
|
||||||
|
|
||||||
or via environment variable
|
or via environment variable
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
export DOMAIN=my.open.desk
|
export DOMAIN=my.open.desk
|
||||||
export ISTIO_DOMAIN=istio.my.open.desk
|
|
||||||
```
|
|
||||||
|
|
||||||
When you configure each subdomain individually, you can set `global.domain` and `istio.domain` to the same value.
|
|
||||||
|
|
||||||
Istio is only used for Open-Xchange Appsuite 8, when you don't want to install it, you can disable Istio:
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
istio:
|
|
||||||
enabled: false
|
|
||||||
oxAppsuite:
|
|
||||||
enabled: false
|
|
||||||
```
|
```
|
||||||
|
|
||||||
### Apps
|
### Apps
|
||||||
|
|||||||
@@ -28,7 +28,6 @@ openDesk is a Kubernetes only solution and requires an existing Kubernetes (K8s)
|
|||||||
- [HelmDiff](https://github.com/databus23/helm-diff) >= 3.6.0
|
- [HelmDiff](https://github.com/databus23/helm-diff) >= 3.6.0
|
||||||
- Volume provisioner supporting RWO (read-write-once)
|
- Volume provisioner supporting RWO (read-write-once)
|
||||||
- Certificate handling with [cert-manager](https://cert-manager.io/)
|
- Certificate handling with [cert-manager](https://cert-manager.io/)
|
||||||
- [Istio](https://istio.io/) is currently required to deploy and operate OX AppSuite8
|
|
||||||
|
|
||||||
# Hardware
|
# Hardware
|
||||||
|
|
||||||
@@ -56,12 +55,8 @@ configured ingress controller deployed.
|
|||||||
|
|
||||||
**Maintained controllers:**
|
**Maintained controllers:**
|
||||||
- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress)
|
- [NGINX Ingress Controller](https://github.com/nginxinc/kubernetes-ingress)
|
||||||
- [HAProxy Kubernetes Ingress Controller](https://github.com/haproxytech/kubernetes-ingress)
|
|
||||||
|
|
||||||
**Community Supported:**
|
|
||||||
- [Ingress NGINX Controller](https://github.com/kubernetes/ingress-nginx)
|
- [Ingress NGINX Controller](https://github.com/kubernetes/ingress-nginx)
|
||||||
|
- [HAProxy Kubernetes Ingress Controller](https://github.com/haproxytech/kubernetes-ingress)
|
||||||
When you want to use Open-Xchange Appsuite 8, you need to deploy and configure additionally [Istio](https://istio.io/)
|
|
||||||
|
|
||||||
# Volume provisioner
|
# Volume provisioner
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ configuration:
|
|||||||
bot:
|
bot:
|
||||||
username: "meetings-bot"
|
username: "meetings-bot"
|
||||||
displayname: "Terminplaner Bot"
|
displayname: "Terminplaner Bot"
|
||||||
openxchangeBaseUrl: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
openxchangeBaseUrl: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
strings:
|
strings:
|
||||||
breakoutSessionWidgetName: "Breakoutsessions"
|
breakoutSessionWidgetName: "Breakoutsessions"
|
||||||
calendarRoomName: "Terminplaner"
|
calendarRoomName: "Terminplaner"
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ global:
|
|||||||
ics:
|
ics:
|
||||||
secret: {{ .Values.secrets.intercom.secret | quote }}
|
secret: {{ .Values.secrets.intercom.secret | quote }}
|
||||||
issuerBaseUrl: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
|
issuerBaseUrl: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}"
|
||||||
originRegex: "{{ .Values.istio.domain }}|{{ .Values.global.domain }}"
|
originRegex: "{{ .Values.global.domain }}"
|
||||||
keycloak:
|
keycloak:
|
||||||
realm: {{ .Values.platform.realm | quote }}
|
realm: {{ .Values.platform.realm | quote }}
|
||||||
default:
|
default:
|
||||||
@@ -49,7 +49,7 @@ ics:
|
|||||||
password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password | quote }}
|
password: {{ .Values.cache.intercomService.password | default .Values.secrets.redis.password | quote }}
|
||||||
openxchange:
|
openxchange:
|
||||||
oci: true
|
oci: true
|
||||||
url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
audience: "opendesk-oxappsuite"
|
audience: "opendesk-oxappsuite"
|
||||||
nextcloud:
|
nextcloud:
|
||||||
audience: "opendesk-nextcloud"
|
audience: "opendesk-nextcloud"
|
||||||
|
|||||||
@@ -9,7 +9,6 @@ global:
|
|||||||
{{ .Values.global.hosts | toYaml | nindent 4 }}
|
{{ .Values.global.hosts | toYaml | nindent 4 }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
|
{{ .Values.global.imagePullSecrets | toYaml | nindent 4 }}
|
||||||
istioDomain: {{ .Values.istio.domain }}
|
|
||||||
|
|
||||||
additionalAnnotations:
|
additionalAnnotations:
|
||||||
intents.otterize.com/service-name: "opendesk-nextcloud-php"
|
intents.otterize.com/service-name: "opendesk-nextcloud-php"
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ SPDX-License-Identifier: Apache-2.0
|
|||||||
*/}}
|
*/}}
|
||||||
---
|
---
|
||||||
global:
|
global:
|
||||||
hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
mysql:
|
mysql:
|
||||||
host: {{ .Values.databases.oxAppsuite.host | quote }}
|
host: {{ .Values.databases.oxAppsuite.host | quote }}
|
||||||
database: {{ .Values.databases.oxAppsuite.name | quote }}
|
database: {{ .Values.databases.oxAppsuite.name | quote }}
|
||||||
@@ -13,9 +13,6 @@ global:
|
|||||||
password: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
|
password: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
|
||||||
rootPassword: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
|
rootPassword: {{ .Values.databases.oxAppsuite.password | default .Values.secrets.mariadb.rootPassword | quote }}
|
||||||
|
|
||||||
istio:
|
|
||||||
enabled: {{ .Values.istio.enabled }}
|
|
||||||
|
|
||||||
nextcloud-integration-ui:
|
nextcloud-integration-ui:
|
||||||
image:
|
image:
|
||||||
registry: {{ .Values.global.imageRegistry | default .Values.images.openxchangeNextcloudIntegrationUI.registry | quote }}
|
registry: {{ .Values.global.imageRegistry | default .Values.images.openxchangeNextcloudIntegrationUI.registry | quote }}
|
||||||
@@ -77,18 +74,22 @@ appsuite:
|
|||||||
switchboard:
|
switchboard:
|
||||||
enabled: false
|
enabled: false
|
||||||
istio:
|
istio:
|
||||||
enabled: {{ .Values.istio.enabled }}
|
enabled: false
|
||||||
ingressGateway:
|
ingress:
|
||||||
name: "opendesk-gateway-istio-gateway"
|
enabled: {{ .Values.ingress.enabled }}
|
||||||
|
ingressClassName: {{ .Values.ingress.ingressClassName | quote }}
|
||||||
|
tls:
|
||||||
|
enabled: true
|
||||||
|
existingSecret: {{ .Values.ingress.tls.secretName | quote }}
|
||||||
|
appsuite:
|
||||||
hosts:
|
hosts:
|
||||||
- "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
- "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
virtualServices:
|
dav:
|
||||||
appsuite:
|
hosts:
|
||||||
hosts:
|
- "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
- "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
routes:
|
||||||
dav:
|
trailslash:
|
||||||
hosts:
|
enabled: false
|
||||||
- "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
|
||||||
core-mw:
|
core-mw:
|
||||||
enabled: true
|
enabled: true
|
||||||
asConfig:
|
asConfig:
|
||||||
@@ -99,7 +100,7 @@ appsuite:
|
|||||||
oidcPath: "/oidc"
|
oidcPath: "/oidc"
|
||||||
masterAdmin: "admin"
|
masterAdmin: "admin"
|
||||||
masterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }}
|
masterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }}
|
||||||
hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
hostname: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
serviceAccount:
|
serviceAccount:
|
||||||
create: true
|
create: true
|
||||||
features:
|
features:
|
||||||
@@ -168,9 +169,9 @@ appsuite:
|
|||||||
com.openexchange.oidc.opJwkSetEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/certs"
|
com.openexchange.oidc.opJwkSetEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/certs"
|
||||||
com.openexchange.oidc.opLogoutEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/logout"
|
com.openexchange.oidc.opLogoutEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/logout"
|
||||||
com.openexchange.oidc.opTokenEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token"
|
com.openexchange.oidc.opTokenEndpoint: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}/protocol/openid-connect/token"
|
||||||
com.openexchange.oidc.rpRedirectURIAuth: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}/appsuite/api/oidc/auth"
|
com.openexchange.oidc.rpRedirectURIAuth: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}/appsuite/api/oidc/auth"
|
||||||
com.openexchange.oidc.rpRedirectURILogout: "https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}"
|
com.openexchange.oidc.rpRedirectURILogout: "https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}"
|
||||||
com.openexchange.oidc.rpRedirectURIPostSSOLogout: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}/appsuite/api/oidc/logout"
|
com.openexchange.oidc.rpRedirectURIPostSSOLogout: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}/appsuite/api/oidc/logout"
|
||||||
com.openexchange.oidc.ssoLogout: "true"
|
com.openexchange.oidc.ssoLogout: "true"
|
||||||
com.openexchange.oidc.startDefaultBackend: "true"
|
com.openexchange.oidc.startDefaultBackend: "true"
|
||||||
com.openexchange.oidc.userLookupClaim: "opendesk_username"
|
com.openexchange.oidc.userLookupClaim: "opendesk_username"
|
||||||
@@ -366,7 +367,7 @@ appsuite:
|
|||||||
enabled: true
|
enabled: true
|
||||||
ingress:
|
ingress:
|
||||||
hosts:
|
hosts:
|
||||||
- host: "{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
- host: "{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
enabled: false
|
enabled: false
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- range .Values.global.imagePullSecrets }}
|
{{- range .Values.global.imagePullSecrets }}
|
||||||
@@ -385,6 +386,8 @@ appsuite:
|
|||||||
auth:
|
auth:
|
||||||
enabled: true
|
enabled: true
|
||||||
password: {{ .Values.secrets.redis.password | quote }}
|
password: {{ .Values.secrets.redis.password | quote }}
|
||||||
|
# Workaround for a bug in 8.23
|
||||||
|
ca: ""
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openxchangeCoreUIMiddleware | toYaml | nindent 6 }}
|
{{ .Values.resources.openxchangeCoreUIMiddleware | toYaml | nindent 6 }}
|
||||||
updater:
|
updater:
|
||||||
|
|||||||
@@ -33,7 +33,7 @@ oxConnector:
|
|||||||
oxMasterAdmin: "admin"
|
oxMasterAdmin: "admin"
|
||||||
oxMasterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }}
|
oxMasterPassword: {{ .Values.secrets.oxAppsuite.adminPassword | quote }}
|
||||||
oxSmtpServer: "smtp://127.0.0.1:587"
|
oxSmtpServer: "smtp://127.0.0.1:587"
|
||||||
oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}"
|
oxSoapServer: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}"
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.oxConnector | toYaml | nindent 2 }}
|
{{ .Values.resources.oxConnector | toYaml | nindent 2 }}
|
||||||
|
|||||||
@@ -60,17 +60,6 @@ repositories:
|
|||||||
url: "{{ .Values.global.helmRegistry | default .Values.charts.postfix.registry }}/\
|
url: "{{ .Values.global.helmRegistry | default .Values.charts.postfix.registry }}/\
|
||||||
{{ .Values.charts.postfix.repository }}"
|
{{ .Values.charts.postfix.repository }}"
|
||||||
|
|
||||||
# openDesk Istio Resources
|
|
||||||
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-istio-resources
|
|
||||||
- name: "istio-resources-repo"
|
|
||||||
keyring: "../../files/gpg-pubkeys/opencode.gpg"
|
|
||||||
verify: {{ .Values.charts.istioResources.verify }}
|
|
||||||
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
|
|
||||||
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
|
|
||||||
oci: true
|
|
||||||
url: "{{ .Values.global.helmRegistry | default .Values.charts.istioResources.registry }}/\
|
|
||||||
{{ .Values.charts.istioResources.repository }}"
|
|
||||||
|
|
||||||
# openDesk ClamAV
|
# openDesk ClamAV
|
||||||
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-clamav
|
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-clamav
|
||||||
- name: "clamav-repo"
|
- name: "clamav-repo"
|
||||||
@@ -190,14 +179,6 @@ releases:
|
|||||||
installed: {{ .Values.clamavSimple.enabled }}
|
installed: {{ .Values.clamavSimple.enabled }}
|
||||||
timeout: 900
|
timeout: 900
|
||||||
|
|
||||||
- name: "opendesk-gateway"
|
|
||||||
chart: "istio-resources-repo/{{ .Values.charts.istioResources.name }}"
|
|
||||||
version: "{{ .Values.charts.istioResources.version }}"
|
|
||||||
values:
|
|
||||||
- "values-istio-gateway.yaml.gotmpl"
|
|
||||||
installed: {{ .Values.istio.enabled }}
|
|
||||||
timeout: 900
|
|
||||||
|
|
||||||
- name: "minio"
|
- name: "minio"
|
||||||
chart: "minio-repo/{{ .Values.charts.minio.name }}"
|
chart: "minio-repo/{{ .Values.charts.minio.name }}"
|
||||||
version: "{{ .Values.charts.minio.version }}"
|
version: "{{ .Values.charts.minio.version }}"
|
||||||
|
|||||||
@@ -11,14 +11,6 @@ global:
|
|||||||
issuerRef:
|
issuerRef:
|
||||||
name: {{ .Values.certificate.issuerRef.name | quote }}
|
name: {{ .Values.certificate.issuerRef.name | quote }}
|
||||||
|
|
||||||
{{- if .Values.istio.enabled }}
|
|
||||||
istio:
|
|
||||||
enabled: {{ .Values.istio.enabled }}
|
|
||||||
domain: {{ .Values.istio.domain | quote }}
|
|
||||||
issuerRef:
|
|
||||||
name: {{ .Values.istio.issuerRef.name | quote }}
|
|
||||||
{{- end }}
|
|
||||||
|
|
||||||
cleanup:
|
cleanup:
|
||||||
keepRessourceOnDelete: {{ .Values.cleanup.keepRessourceOnDelete }}
|
keepRessourceOnDelete: {{ .Values.cleanup.keepRessourceOnDelete }}
|
||||||
|
|
||||||
|
|||||||
@@ -1,12 +0,0 @@
|
|||||||
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
|
|
||||||
# SPDX-License-Identifier: Apache-2.0
|
|
||||||
---
|
|
||||||
global:
|
|
||||||
domain: {{ .Values.istio.domain | quote }}
|
|
||||||
hosts:
|
|
||||||
openxchange: {{ .Values.global.hosts.openxchange | quote }}
|
|
||||||
|
|
||||||
tls:
|
|
||||||
httpsRedirect: false
|
|
||||||
secretName: "{{ .Values.istio.domain }}-tls"
|
|
||||||
...
|
|
||||||
@@ -253,7 +253,7 @@ config:
|
|||||||
clientAuthenticatorType: "client-secret"
|
clientAuthenticatorType: "client-secret"
|
||||||
secret: {{ .Values.secrets.keycloak.clientSecret.as8oidc | quote }}
|
secret: {{ .Values.secrets.keycloak.clientSecret.as8oidc | quote }}
|
||||||
redirectUris:
|
redirectUris:
|
||||||
- "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}/*"
|
- "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}/*"
|
||||||
- "https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}/*"
|
- "https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}/*"
|
||||||
consentRequired: false
|
consentRequired: false
|
||||||
frontchannelLogout: false
|
frontchannelLogout: false
|
||||||
@@ -261,8 +261,8 @@ config:
|
|||||||
authorizationServicesEnabled: false
|
authorizationServicesEnabled: false
|
||||||
attributes:
|
attributes:
|
||||||
backchannel.logout.session.required: true
|
backchannel.logout.session.required: true
|
||||||
backchannel.logout.url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}/ajax/oidc/backchannel_logout"
|
backchannel.logout.url: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}/ajax/oidc/backchannel_logout"
|
||||||
post.logout.redirect.uris: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.istio.domain }}/*##https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}/*"
|
post.logout.redirect.uris: "https://{{ .Values.global.hosts.openxchange }}.{{ .Values.global.domain }}/*##https://{{ .Values.global.hosts.univentionManagementStack }}.{{ .Values.global.domain }}/*"
|
||||||
protocolMappers:
|
protocolMappers:
|
||||||
- name: "context"
|
- name: "context"
|
||||||
protocol: "openid-connect"
|
protocol: "openid-connect"
|
||||||
|
|||||||
@@ -630,7 +630,7 @@ stack-data-swp:
|
|||||||
externalDomainName: {{ .Values.global.domain | quote }}
|
externalDomainName: {{ .Values.global.domain | quote }}
|
||||||
externalMailDomain: {{ .Values.global.domain | quote }}
|
externalMailDomain: {{ .Values.global.domain | quote }}
|
||||||
|
|
||||||
portalGroupwareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.istio.domain | quote }}
|
portalGroupwareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.openxchange .Values.global.domain | quote }}
|
||||||
portalFileshareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.nextcloud .Values.global.domain | quote }}
|
portalFileshareLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.nextcloud .Values.global.domain | quote }}
|
||||||
portalRealtimeCollaborationLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.element .Values.global.domain | quote }}
|
portalRealtimeCollaborationLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.element .Values.global.domain | quote }}
|
||||||
portalRealtimeVideoconferenceLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.jitsi .Values.global.domain | quote }}
|
portalRealtimeVideoconferenceLinkBase: {{ printf "https://%s.%s" .Values.global.hosts.jitsi .Values.global.domain | quote }}
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ charts:
|
|||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/charts/opendesk-certificates"
|
repository: "bmi/opendesk/components/platform-development/charts/opendesk-certificates"
|
||||||
name: "opendesk-certificates"
|
name: "opendesk-certificates"
|
||||||
version: "2.1.1"
|
version: "2.1.3"
|
||||||
verify: true
|
verify: true
|
||||||
clamav:
|
clamav:
|
||||||
# providerCategory: 'Platform'
|
# providerCategory: 'Platform'
|
||||||
@@ -102,16 +102,6 @@ charts:
|
|||||||
name: "intercom-service"
|
name: "intercom-service"
|
||||||
version: "2.0.1"
|
version: "2.0.1"
|
||||||
verify: true
|
verify: true
|
||||||
istioResources:
|
|
||||||
# providerCategory: 'Platform'
|
|
||||||
# providerResponsible: 'openDesk'
|
|
||||||
# upstreamRegistry: 'registry.opencode.de'
|
|
||||||
# upstreamRepository: 'bmi/opendesk/components/platform-development/charts/opendesk-istio-resources/istio-gateway'
|
|
||||||
registry: "registry.opencode.de"
|
|
||||||
repository: "bmi/opendesk/components/platform-development/charts/opendesk-istio-resources"
|
|
||||||
name: "istio-gateway"
|
|
||||||
version: "2.0.1"
|
|
||||||
verify: true
|
|
||||||
jitsi:
|
jitsi:
|
||||||
# providerCategory: 'Platform'
|
# providerCategory: 'Platform'
|
||||||
# providerResponsible: 'openDesk'
|
# providerResponsible: 'openDesk'
|
||||||
@@ -210,7 +200,7 @@ charts:
|
|||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
|
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
|
||||||
name: "opendesk-nextcloud"
|
name: "opendesk-nextcloud"
|
||||||
version: "1.5.0"
|
version: "1.5.1"
|
||||||
verify: true
|
verify: true
|
||||||
nextcloudManagement:
|
nextcloudManagement:
|
||||||
# providerCategory: 'Platform'
|
# providerCategory: 'Platform'
|
||||||
@@ -220,7 +210,7 @@ charts:
|
|||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
|
repository: "bmi/opendesk/components/platform-development/charts/opendesk-nextcloud"
|
||||||
name: "opendesk-nextcloud-management"
|
name: "opendesk-nextcloud-management"
|
||||||
version: "1.5.0"
|
version: "1.5.1"
|
||||||
verify: true
|
verify: true
|
||||||
nginx:
|
nginx:
|
||||||
# providerCategory: 'Community'
|
# providerCategory: 'Community'
|
||||||
@@ -274,7 +264,7 @@ charts:
|
|||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/charts-mirror"
|
repository: "bmi/opendesk/components/supplier/open-xchange/charts-mirror"
|
||||||
name: "appsuite-public-sector"
|
name: "appsuite-public-sector"
|
||||||
version: "2.4.49"
|
version: "2.5.3"
|
||||||
verify: false
|
verify: false
|
||||||
openXchangeAppSuiteBootstrap:
|
openXchangeAppSuiteBootstrap:
|
||||||
# providerCategory: 'Platform'
|
# providerCategory: 'Platform'
|
||||||
@@ -294,7 +284,7 @@ charts:
|
|||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/platform-development/charts/opendesk-otterize"
|
repository: "bmi/opendesk/components/platform-development/charts/opendesk-otterize"
|
||||||
name: "opendesk-otterize"
|
name: "opendesk-otterize"
|
||||||
version: "2.0.0"
|
version: "2.0.1"
|
||||||
verify: true
|
verify: true
|
||||||
oxConnector:
|
oxConnector:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
|
|||||||
@@ -306,7 +306,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['8', '20', '51']
|
# upstreamMirrorStartFrom: ['8', '20', '51']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/middleware-public-sector"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/middleware-public-sector"
|
||||||
tag: "8.22.52@sha256:dab45b0e308b8d5c6c5cb5ec5be9d711f55e7aa87375c4b08ab178287bb7b769"
|
tag: "8.23.47@sha256:b721bf41d7f06b328e9235a0561436cb678bc2a1a67202f0fa6e1f55956cc0cc"
|
||||||
openxchangeCoreUI:
|
openxchangeCoreUI:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -316,7 +316,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['8', '20', '1']
|
# upstreamMirrorStartFrom: ['8', '20', '1']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui"
|
||||||
tag: "8.22.1@sha256:4b581d8fb3761156a5dd81a2cebc1c7a0382652d01ba6ee933527f9899b41768"
|
tag: "8.23.2@sha256:0cc07053cbb9d7062a17ef807c6a6942a912748243a6f0c63a892d5cb2953351"
|
||||||
openxchangeCoreUIMiddleware:
|
openxchangeCoreUIMiddleware:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -326,7 +326,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['2', '0', '0']
|
# upstreamMirrorStartFrom: ['2', '0', '0']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui-middleware"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-ui-middleware"
|
||||||
tag: "2.0.2@sha256:eafcc0242b3fd93a777077c136b9e87fe03b163988731c15f0d3cd2ba39a2165"
|
tag: "2.0.3@sha256:56fe8afe841105f0725674e36afc6f10f22751e3c21a301a6322834383f2d786"
|
||||||
openxchangeCoreUserGuide:
|
openxchangeCoreUserGuide:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -336,7 +336,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['8', '20', '799279']
|
# upstreamMirrorStartFrom: ['8', '20', '799279']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-user-guide"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/core-user-guide"
|
||||||
tag: "8.22.909960@sha256:dbd3f3a37c2d0a2885234cee53d79bf69015392c1381433c008694b4b99ddf30"
|
tag: "8.23.941932@sha256:231b13cb795241513d2f54ee4bc628843ae737b5ecceab758aba3658f03de1bd"
|
||||||
openxchangeDocumentConverter:
|
openxchangeDocumentConverter:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -346,7 +346,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['8', '20', '50']
|
# upstreamMirrorStartFrom: ['8', '20', '50']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/documentconverter"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/documentconverter"
|
||||||
tag: "8.22.49@sha256:21ab0b52fa54fb5be969c4c689e4b7724b7bf9ee79b1bf166ab27d8c67e3a6b6"
|
tag: "8.23.43@sha256:aa9bbce833ae018573997fb07dcaf32bb7c5c4c6a7d6331f3d3156fd5b8d53b3"
|
||||||
openxchangeGotenberg:
|
openxchangeGotenberg:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -366,7 +366,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['4', '2', '2']
|
# upstreamMirrorStartFrom: ['4', '2', '2']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/guard-ui"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/guard-ui"
|
||||||
tag: "8.22.0@sha256:89c18129a2bdffe24587494e96ad12e95c01c25cd7a6a7b177afc75fec70415c"
|
tag: "8.23.0@sha256:0510458017fa028582515ce18c0b12f91ac9e23f0e94e99ac34fd49b07146c01"
|
||||||
openxchangeImageConverter:
|
openxchangeImageConverter:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
@@ -376,7 +376,7 @@ images:
|
|||||||
# upstreamMirrorStartFrom: ['8', '20', '50']
|
# upstreamMirrorStartFrom: ['8', '20', '50']
|
||||||
registry: "registry.opencode.de"
|
registry: "registry.opencode.de"
|
||||||
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/imageconverter"
|
repository: "bmi/opendesk/components/supplier/open-xchange/images-mirror/imageconverter"
|
||||||
tag: "8.22.49@sha256:42841719c515b21f5d6e18296116fe690ac63f82f5acfa877652c2639911f127"
|
tag: "8.23.43@sha256:ecc77a569f60e1b14f0d77ec93d891200b89d11eb9d7c26f59fa7696343e20e3"
|
||||||
openxchangeNextcloudIntegrationUI:
|
openxchangeNextcloudIntegrationUI:
|
||||||
# providerCategory: 'Supplier'
|
# providerCategory: 'Supplier'
|
||||||
# providerResponsible: 'Open-Xchange'
|
# providerResponsible: 'Open-Xchange'
|
||||||
|
|||||||
@@ -1,15 +0,0 @@
|
|||||||
{{/*
|
|
||||||
SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
|
|
||||||
SPDX-License-Identifier: Apache-2.0
|
|
||||||
*/}}
|
|
||||||
---
|
|
||||||
istio:
|
|
||||||
enabled: true
|
|
||||||
domain: {{ env "ISTIO_DOMAIN" | default "souvap.cloud" | quote }}
|
|
||||||
virtualService:
|
|
||||||
enabled: false
|
|
||||||
gateway:
|
|
||||||
enabled: true
|
|
||||||
issuerRef:
|
|
||||||
name: "letsencrypt-istio-prod"
|
|
||||||
...
|
|
||||||
Reference in New Issue
Block a user