Compare commits

..

11 Commits

Author SHA1 Message Date
opendesk
812eb5a439 chore(release): 0.5.48 [skip ci]
## [0.5.48](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.47...v0.5.48) (2023-11-24)

### Bug Fixes

* **services:** Update resource requests and remove cpu limits ([f86a74b](f86a74ba10))
2023-11-24 17:10:40 +00:00
Dominik Kaminski
f86a74ba10 fix(services): Update resource requests and remove cpu limits 2023-11-24 17:06:46 +00:00
opendesk
71d11cfcd0 chore(release): 0.5.47 [skip ci]
## [0.5.47](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.46...v0.5.47) (2023-11-24)

### Bug Fixes

* **helmfile:** Rename absolute paths on OpenCoDE to new 'opendesk' base group name ([7ac2e0f](7ac2e0f9de))
* **xwiki:** Enable the sync of user profile picture from LDAP ([6aa3d38](6aa3d386af))
2023-11-24 16:50:40 +00:00
Thorsten Rossner
6aa3d386af fix(xwiki): Enable the sync of user profile picture from LDAP 2023-11-24 16:48:49 +00:00
Thorsten Rossner
7ac2e0f9de fix(helmfile): Rename absolute paths on OpenCoDE to new 'opendesk' base group name 2023-11-24 16:29:50 +00:00
openDesk
6f556bce70 chore(release): 0.5.46 [skip ci]
## [0.5.46](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.45...v0.5.46) (2023-11-23)

### Bug Fixes

* **element:** Fix quotes in element chart ([a447c13](a447c137fe))
2023-11-23 13:28:52 +00:00
Thomas Kaltenbrunner
a447c137fe fix(element): Fix quotes in element chart 2023-11-23 13:27:11 +00:00
openDesk
47a385683c chore(release): 0.5.45 [skip ci]
## [0.5.45](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.44...v0.5.45) (2023-11-22)

### Bug Fixes

* **open-xchange:** Add security context ([db48140](db48140f3a))
2023-11-22 19:50:22 +00:00
Thomas Kaltenbrunner
db48140f3a fix(open-xchange): Add security context 2023-11-22 19:48:13 +00:00
openDesk
d7cae3b1fa chore(release): 0.5.44 [skip ci]
## [0.5.44](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.43...v0.5.44) (2023-11-21)

### Bug Fixes

* **ci:** Remove default BASE_DOMAIN in .gitlab-ci.yml ([7ae65a3](7ae65a36a2))
2023-11-21 12:05:51 +00:00
Dominik Kaminski
7ae65a36a2 fix(ci): Remove default BASE_DOMAIN in .gitlab-ci.yml 2023-11-20 14:52:16 +01:00
19 changed files with 501 additions and 194 deletions

View File

@@ -33,9 +33,6 @@ variables:
description: "Define which cluster to use. Cluster must be defined in gitlab/environments.yaml of
sovereign-workplace-env included above."
value: "dev"
BASE_DOMAIN:
description: "Define the Cluster Base Domain."
value: "souvap.cloud"
MASTER_PASSWORD_WEB_VAR:
description: "Optional: Provide a passphrase to be used for password generation."
value: ""
@@ -150,9 +147,6 @@ variables:
UMS_TESTS_BRANCH:
description: "Branch of E2E test suite of SouvAP Dev team"
value: "main"
# please use the following set of variables with normalized names:
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
.deploy-common:
cache: {}
@@ -204,7 +198,6 @@ env-cleanup:
env-start:
environment:
name: "${NAMESPACE}"
url: "https://portal.${DOMAIN}"
on_stop: "env-stop"
extends: ".deploy-common"
image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"
@@ -443,10 +436,6 @@ run-tests:
extends: ".deploy-common"
environment:
name: "${NAMESPACE}"
tags:
- "docker"
- "kubernetes"
- "${CLUSTER}"
stage: "tests"
rules:
- if: >
@@ -503,10 +492,6 @@ run-souvap-dev-tests:
extends: ".deploy-common"
environment:
name: "${NAMESPACE}"
tags:
- "docker"
- "kubernetes"
- "${CLUSTER}"
stage: "tests"
rules:
- if: >
@@ -570,7 +555,7 @@ generate-release-assets:
- "./build_artefacts/image-index.json"
tags: []
variables:
ASSET_GENERATOR_REPO_PATH: "bmi/souveraener_arbeitsplatz/tooling/opendesk-asset-generator"
ASSET_GENERATOR_REPO_PATH: "bmi/opendesk/tooling/opendesk-asset-generator"
# Declare .environments which is in environments repository and only loaded when INCLUDE_ENVIRONMENTS_ENABLED not false.

View File

@@ -1,3 +1,39 @@
## [0.5.48](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.47...v0.5.48) (2023-11-24)
### Bug Fixes
* **services:** Update resource requests and remove cpu limits ([f86a74b](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/f86a74ba100c7f08f6538b58a713bbc87c00e814))
## [0.5.47](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/compare/v0.5.46...v0.5.47) (2023-11-24)
### Bug Fixes
* **helmfile:** Rename absolute paths on OpenCoDE to new 'opendesk' base group name ([7ac2e0f](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/7ac2e0f9de2a8386a7f5809ba40db4ed7164a857))
* **xwiki:** Enable the sync of user profile picture from LDAP ([6aa3d38](https://gitlab.opencode.de/bmi/opendesk/deployment/sovereign-workplace/commit/6aa3d386afe8b3f22e47f9971fd719089006b54e))
## [0.5.46](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.45...v0.5.46) (2023-11-23)
### Bug Fixes
* **element:** Fix quotes in element chart ([a447c13](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/a447c137fe58be343e7ada55afb7f6891a5cde74))
## [0.5.45](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.44...v0.5.45) (2023-11-22)
### Bug Fixes
* **open-xchange:** Add security context ([db48140](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/db48140f3ae6576b21e93ac0f10f40765efd608d))
## [0.5.44](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.43...v0.5.44) (2023-11-21)
### Bug Fixes
* **ci:** Remove default BASE_DOMAIN in .gitlab-ci.yml ([7ae65a3](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/7ae65a36a2777d249ba3784bf965da4c790a1b21))
## [0.5.43](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.42...v0.5.43) (2023-11-20)

View File

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

View File

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

View File

@@ -18,13 +18,12 @@ 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:
- `BASE_DOMAIN`: The base domain the SWP will use. For example: `souvap.cloud`
- `DOMAIN` = The domain to deploy to.
- `ISTIO_DOMAIN` = istio.`DOMAIN`
- `NAMESPACE`: Defines into which namespace of your K8s cluster the SWP will be installed
- `MASTER_PASSWORD_WEB_VAR`: Overwrites value of `MASTER_PASSWORD`
Based on your input, the following variables will be set:
- `DOMAIN` = `NAMESPACE`.`BASE_DOMAIN`
- `ISTIO_DOMAIN` = istio.`DOMAIN`
- `MASTER_PASSWORD` = `MASTER_PASSWORD_WEB_VAR`. If `MASTER_PASSWORD_WEB_VAR`
is not set, the default for `MASTER_PASSWORD` will be used, unless you set
`MASTER_PASSWORD` as a masked CI/CD variable in Gitlab to supersede the default.

View File

@@ -51,13 +51,14 @@ This list gives you an overview of default security settings and if they comply
| Component | Process | = | allowPrivilegeEscalation (`false`) | capabilities (`drop: ALL`) | seccompProfile (`RuntimeDefault`) | readOnlyRootFilesystem (`true`) | runAsNonRoot (`true`) | runAsUser | runAsGroup | fsGroup |
|-------------|--------------------------|:------------------:|:----------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------:|:-------------------------------:|:---------------------:|:---------:|:----------:|:-------:|
|--------------|----------------------------|:------------------:|:----------------------------------:|:----------------------------------------------------------------------------------------------------------------------------------------------:|:---------------------------------:|:-------------------------------:|:---------------------:|:---------:|:----------:|:-------:|
| ClamAV | clamd | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 100 | 101 | 101 |
| | freshclam | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 100 | 101 | 101 |
| | icap | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 100 | 101 | 101 |
| | milter | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 100 | 101 | 101 |
| Collabora | collabora | :x: | :x: | :x: (`CHOWN`, `DAC_OVERRIDE`, `FOWNER`, `FSETID`, `KILL`, `SETGID`, `SETUID`, `SETPCAP`, `NET_BIND_SERVICE`, `NET_RAW`, `SYS_CHROOT`, `MKNOD`) | :white_check_mark: | :x: | :white_check_mark: | 100 | 101 | 100 |
| CryptPad | cryptpad | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | 4001 | 4001 | 4001 |
| CryptPad | npm | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | 4001 | 4001 | 4001 |
| Dovecot | dovecot | :x: | :white_check_mark: | :x: (`CHOWN`, `DAC_OVERRIDE`, `NET_BIND_SERVICE`, `SETGID`, `SETUID`, `SYS_CHROOT`) | :white_check_mark: | :white_check_mark: | :x: | - | - | 1000 |
| Element | element | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 101 | 101 | 101 |
| | synapse | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 10991 | - | 10991 |
| | synapseWeb | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 101 | 101 | 101 |
@@ -75,5 +76,17 @@ This list gives you an overview of default security settings and if they comply
| MariaDB | mariadb | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1001 | 1001 | 1001 |
| Memcached | memcached | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1001 | - | 1001 |
| Postfix | postfix | :x: | :x: | :x: | :white_check_mark: | :x: | :x: | - | - | 101 |
| Open-Xchange | core-documentconverter | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | 987 | 1000 | - |
| | core-guidedtours | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | core-imageconverter | :x: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :x: | :white_check_mark: | 987 | 1000 | - |
| | core-mw-default | :x: | :x: | :x: | :x: | :x: | :x: | - | - | - |
| | core-ui | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | core-ui-middleware | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | core-ui-middleware-updater | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | core-user-guide | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | gotenberg | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | guard-ui | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | nextlcoud-integration-ui | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| | public-sector-ui | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1000 | 1000 | - |
| OpenProject | openproject | :x: | :white_check_mark: | :x: | :white_check_mark: | :x: | :x: | - | - | - |
| PostgreSQL | postgresql | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | :white_check_mark: | 1001 | 1001 | 1001 |

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -1,6 +1,24 @@
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
# SPDX-License-Identifier: Apache-2.0
---
containerSecurityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
add:
- "CHOWN"
- "DAC_OVERRIDE"
- "KILL"
- "NET_BIND_SERVICE"
- "SETGID"
- "SETUID"
- "SYS_CHROOT"
enabled: true
readOnlyRootFilesystem: true
seccompProfile:
type: "RuntimeDefault"
dovecot:
ldap:
enabled: true
@@ -16,4 +34,8 @@ dovecot:
enabled: true
ssl: "no"
host: "postfix:25"
podSecurityContext:
enabled: true
fsGroup: 1000
...

View File

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

View File

@@ -14,6 +14,17 @@ appsuite:
masterAdmin: "admin"
gotenberg:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
privileged: false
readOnlyRootFilesystem: true
runAsNonRoot: true
runAsUser: 1001
seccompProfile:
type: "RuntimeDefault"
features:
status:
# enable admin pack
@@ -27,6 +38,7 @@ appsuite:
open-xchange-authentication-oauth: "enabled"
properties:
com.openexchange.UIWebPath: "/appsuite/"
com.openexchange.showAdmin: "false"
# PDF Export
com.openexchange.capability.mail_export_pdf: "true"
com.openexchange.mail.exportpdf.gotenberg.enabled: "true"
@@ -158,8 +170,23 @@ appsuite:
mkdir -p /opt/open-xchange/guard-files
chown open-xchange:open-xchange /opt/open-xchange/guard-files
# Security context for core-mw has no effect yet
# podSecurityContext: {}
# securityContext: {}
core-ui:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
core-ui-middleware:
enabled: true
@@ -170,15 +197,62 @@ appsuite:
- "redis-master:6379"
auth:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
core-guidedtours:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
guard-ui:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
core-cacheservice:
enabled: false
core-user-guide:
enabled: true
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
core-imageconverter:
enabled: true
@@ -188,6 +262,19 @@ appsuite:
endpoint: "."
accessKey: "."
secretKey: "."
podSecurityContext:
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 987
seccompProfile:
type: "RuntimeDefault"
securityContext:
# missing:
# readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
core-spellcheck:
enabled: false
@@ -198,6 +285,19 @@ appsuite:
cache:
remoteCache:
enabled: false
podSecurityContext:
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 987
seccompProfile:
type: "RuntimeDefault"
securityContext:
# missing:
# readOnlyRootFilesystem: true
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
core-documents-collaboration:
enabled: false
@@ -213,3 +313,30 @@ appsuite:
enabled: false
core-drive-help:
enabled: false
nextcloud-integration-ui:
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
public-sector-ui:
securityContext:
allowPrivilegeEscalation: false
capabilities:
drop:
- "ALL"
readOnlyRootFilesystem: true
runAsGroup: 1000
runAsNonRoot: true
runAsUser: 1000
seccompProfile:
type: "RuntimeDefault"
...

View File

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

View File

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

View File

@@ -1,362 +1,455 @@
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
# SPDX-License-Identifier: Apache-2.0
---
# Some charts do not support null or ~ values, because they use their default values.
# To not limit the CPU, we set all CPU limits to 99.
resources:
clamd:
limits:
cpu: 4
cpu: 99
memory: "4Gi"
requests:
cpu: 0.1
memory: "2Gi"
memory: "1.5Gi"
collabora:
limits:
cpu: 4
cpu: 99
memory: "4Gi"
requests:
cpu: 0.5
memory: "1Gi"
memory: "512Mi"
cryptpad:
limits:
cpu: 2
cpu: 99
memory: "2Gi"
requests:
cpu: 0.1
memory: "512Mi"
dovecot:
limits:
cpu: 0.5
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "32Mi"
element:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "32Mi"
freshclam:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "96Mi"
icap:
limits:
cpu: 2
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "16Mi"
intercomService:
limits:
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "64Mi"
jibri:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "768Mi"
requests:
cpu: 0.1
memory: "125Mi"
memory: "384Mi"
jicofo:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "256Mi"
jitsi:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "32Mi"
jitsiKeycloakAdapter:
limits:
cpu: "100m"
cpu: 99
memory: "128Mi"
requests:
cpu: "10m"
memory: "16Mi"
memory: "48Mi"
jvb:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "768Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "384Mi"
keycloak:
limits:
cpu: 2
cpu: 99
memory: "2Gi"
requests:
cpu: 0.1
memory: "750Mi"
memory: "512Mi"
keycloakExtension:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "48Mi"
keycloakBootstrap:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
keycloakProxy:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "48Mi"
mariadb:
limits:
cpu: 2
cpu: 99
memory: "2Gi"
requests:
cpu: 0.1
memory: "500Mi"
memory: "384Mi"
matrixNeoBoardWidget:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "48Mi"
matrixNeoChoiceWidget:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "48Mi"
matrixNeoDateFixBot:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "128Mi"
matrixNeoDateFixWidget:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "48Mi"
matrixUserVerificationService:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "128Mi"
memcached:
limits:
cpu: 1
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "32Mi"
milter:
limits:
cpu: 4
memory: "4Gi"
cpu: 99
memory: "96Mi"
requests:
cpu: 0.1
memory: "2Gi"
memory: "16Mi"
minio:
limits:
cpu: 2
memory: "4Gi"
cpu: 99
memory: "2Gi"
requests:
cpu: 0.25
memory: "1Gi"
memory: "256Mi"
nextcloud:
limits:
cpu: 2
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "500Mi"
memory: "512Mi"
nextcloudMetrics:
limits:
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "32Mi"
openproject:
limits:
cpu: 2
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
oxConnector:
memory: "768Mi"
openxchangeCoreDocumentConverter:
limits:
cpu: 2
memory: "2Gi"
requests:
cpu: 0.1
memory: "250Mi"
oxDocumentConverter:
limits:
cpu: 2
cpu: 99
memory: "2Gi"
requests:
cpu: 0.25
memory: "1Gi"
memory: "1.25Gi"
openxchangeCoreGuidedtours:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.01
memory: "32Mi"
openxchangeCoreImageConverter:
limits:
cpu: 99
memory: "2Gi"
requests:
cpu: 0.5
memory: "1.25Gi"
openxchangeCoreMW:
limits:
cpu: 99
memory: "8Gi"
requests:
cpu: 1
memory: "1.25Gi"
openxchangeCoreUI:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.01
memory: "32Mi"
openxchangeCoreUIMiddleware:
limits:
cpu: 99
memory: "768Mi"
requests:
cpu: 0.5
memory: "192Mi"
openxchangeCoreUIMiddlewareUpdater:
limits:
cpu: 99
memory: "768Mi"
requests:
cpu: 0.5
memory: "192Mi"
openxchangeCoreUserGuide:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.02
memory: "32Mi"
openxchangeGotenberg:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.05
memory: "32Mi"
openxchangeGuardUI:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.01
memory: "32Mi"
openxchangeNextcloudIntegrationUI:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.01
memory: "32Mi"
openxchangePublicSectorUI:
limits:
cpu: 99
memory: "96Mi"
requests:
cpu: 0.01
memory: "32Mi"
oxConnector:
limits:
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "64Mi"
postfix:
limits:
cpu: 0.5
memory: "250Mi"
cpu: 99
memory: "128Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "16Mi"
postgresql:
limits:
cpu: 2
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
prosody:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "512Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "32Mi"
redis:
limits:
cpu: 1
memory: "500Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "100Mi"
memory: "32Mi"
synapse:
limits:
cpu: 4
cpu: 99
memory: "4Gi"
requests:
cpu: 1
memory: "2Gi"
memory: "256Mi"
synapseWeb:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "64Mi"
univentionCorporateServer:
limits:
cpu: 2
cpu: 99
memory: "4Gi"
requests:
cpu: 0.5
memory: "1Gi"
umsLdapNotifier:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsLdapServer:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsNotificationsApi:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsPortalFrontend:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsPortalListener:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsPortalListenerDependencies:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsPortalServer:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsStackDataUms:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsStackDataSwp:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsStoreDav:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsUdmRestApi:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsUmcGateway:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
umsUmcServer:
limits:
cpu: 1
cpu: 99
memory: "1Gi"
requests:
cpu: 0.1
memory: "250Mi"
memory: "256Mi"
wellKnown:
limits:
cpu: 1
memory: "250Mi"
cpu: 99
memory: "256Mi"
requests:
cpu: 0.1
memory: "50Mi"
memory: "32Mi"
xwiki:
limits:
cpu: 2
cpu: 99
memory: "8Gi"
requests:
cpu: 0.1
memory: "6Gi"
memory: "1.5Gi"
...