Compare commits

..

6 Commits

Author SHA1 Message Date
Thorsten Roßner
7093022ec4 chore(release): 0.5.19 [skip ci]
## [0.5.19](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.18...v0.5.19) (2023-10-30)

### Bug Fixes

* **element:** Update Element Web and Nordeck Widgets to latest releases ([2313f75](2313f75dbe))
2023-10-30 14:46:49 +00:00
Milton Moura
2313f75dbe fix(element): Update Element Web and Nordeck Widgets to latest releases 2023-10-30 14:43:46 +00:00
Thorsten Roßner
af9caea726 chore(release): 0.5.18 [skip ci]
## [0.5.18](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.17...v0.5.18) (2023-10-28)

### Bug Fixes

* **xwiki:** Switch to Alpine/Jetty slim image ([b399869](b39986907c))
2023-10-28 04:51:22 +00:00
Thomas Kaltenbrunner
b39986907c fix(xwiki): Switch to Alpine/Jetty slim image 2023-10-28 04:49:31 +00:00
Thorsten Roßner
a02d7c6085 chore(release): 0.5.17 [skip ci]
## [0.5.17](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.16...v0.5.17) (2023-10-28)

### Bug Fixes

* **nextcloud:** Update swp_integration app and prepare CryptPad integration ([a046dea](a046deaf17))
2023-10-28 04:30:26 +00:00
Thomas Kaltenbrunner
a046deaf17 fix(nextcloud): Update swp_integration app and prepare CryptPad integration 2023-10-28 04:28:48 +00:00
10 changed files with 98 additions and 46 deletions

View File

@@ -1,3 +1,24 @@
## [0.5.19](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.18...v0.5.19) (2023-10-30)
### Bug Fixes
* **element:** Update Element Web and Nordeck Widgets to latest releases ([2313f75](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/2313f75dbe32d855b0c440944bd0de51c8e104ca))
## [0.5.18](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.17...v0.5.18) (2023-10-28)
### Bug Fixes
* **xwiki:** Switch to Alpine/Jetty slim image ([b399869](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/b39986907cece3cec06012531a55b2699d131f90))
## [0.5.17](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.16...v0.5.17) (2023-10-28)
### Bug Fixes
* **nextcloud:** Update swp_integration app and prepare CryptPad integration ([a046dea](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/commit/a046deaf173ab41029c2ab5e3161bd89e0fdabcb))
## [0.5.16](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.15...v0.5.16) (2023-10-26) ## [0.5.16](https://gitlab.opencode.de/bmi/souveraener_arbeitsplatz/deployment/sovereign-workplace/compare/v0.5.15...v0.5.16) (2023-10-26)

View File

@@ -34,6 +34,7 @@ releases:
- "values-element.yaml" - "values-element.yaml"
- "values-element.gotmpl" - "values-element.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "opendesk-well-known" - name: "opendesk-well-known"
chart: "opendesk-element-repo/opendesk-well-known" chart: "opendesk-element-repo/opendesk-well-known"
@@ -42,6 +43,7 @@ releases:
- "values-well-known.yaml" - "values-well-known.yaml"
- "values-well-known.gotmpl" - "values-well-known.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "opendesk-synapse-web" - name: "opendesk-synapse-web"
chart: "opendesk-element-repo/opendesk-synapse-web" chart: "opendesk-element-repo/opendesk-synapse-web"
@@ -50,6 +52,7 @@ releases:
- "values-synapse-web.yaml" - "values-synapse-web.yaml"
- "values-synapse-web.gotmpl" - "values-synapse-web.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "opendesk-synapse" - name: "opendesk-synapse"
chart: "opendesk-element-repo/opendesk-synapse" chart: "opendesk-element-repo/opendesk-synapse"
@@ -58,6 +61,7 @@ releases:
- "values-synapse.yaml" - "values-synapse.yaml"
- "values-synapse.gotmpl" - "values-synapse.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "opendesk-matrix-user-verification-service-bootstrap" - name: "opendesk-matrix-user-verification-service-bootstrap"
chart: "opendesk-element-repo/opendesk-synapse-create-account" chart: "opendesk-element-repo/opendesk-synapse-create-account"
@@ -66,6 +70,7 @@ releases:
- "values-matrix-user-verification-service-bootstrap.yaml" - "values-matrix-user-verification-service-bootstrap.yaml"
- "values-matrix-user-verification-service-bootstrap.gotmpl" - "values-matrix-user-verification-service-bootstrap.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "opendesk-matrix-user-verification-service" - name: "opendesk-matrix-user-verification-service"
chart: "opendesk-element-repo/opendesk-matrix-user-verification-service" chart: "opendesk-element-repo/opendesk-matrix-user-verification-service"
@@ -74,6 +79,7 @@ releases:
- "values-matrix-user-verification-service.yaml" - "values-matrix-user-verification-service.yaml"
- "values-matrix-user-verification-service.gotmpl" - "values-matrix-user-verification-service.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "matrix-neoboard-widget" - name: "matrix-neoboard-widget"
chart: "opendesk-matrix-widgets-repo/matrix-neoboard-widget" chart: "opendesk-matrix-widgets-repo/matrix-neoboard-widget"
@@ -82,6 +88,7 @@ releases:
- "values-matrix-neoboard-widget.yaml" - "values-matrix-neoboard-widget.yaml"
- "values-matrix-neoboard-widget.gotmpl" - "values-matrix-neoboard-widget.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "matrix-neochoice-widget" - name: "matrix-neochoice-widget"
chart: "opendesk-matrix-widgets-repo/matrix-neochoice-widget" chart: "opendesk-matrix-widgets-repo/matrix-neochoice-widget"
@@ -90,6 +97,7 @@ releases:
- "values-matrix-neochoice-widget.yaml" - "values-matrix-neochoice-widget.yaml"
- "values-matrix-neochoice-widget.gotmpl" - "values-matrix-neochoice-widget.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "matrix-neodatefix-widget" - name: "matrix-neodatefix-widget"
chart: "opendesk-matrix-widgets-repo/matrix-neodatefix-widget" chart: "opendesk-matrix-widgets-repo/matrix-neodatefix-widget"
@@ -98,6 +106,7 @@ releases:
- "values-matrix-neodatefix-widget.yaml" - "values-matrix-neodatefix-widget.yaml"
- "values-matrix-neodatefix-widget.gotmpl" - "values-matrix-neodatefix-widget.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "matrix-neodatefix-bot-bootstrap" - name: "matrix-neodatefix-bot-bootstrap"
chart: "opendesk-element-repo/opendesk-synapse-create-account" chart: "opendesk-element-repo/opendesk-synapse-create-account"
@@ -106,6 +115,7 @@ releases:
- "values-matrix-neodatefix-bot-bootstrap.yaml" - "values-matrix-neodatefix-bot-bootstrap.yaml"
- "values-matrix-neodatefix-bot-bootstrap.gotmpl" - "values-matrix-neodatefix-bot-bootstrap.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
- name: "matrix-neodatefix-bot" - name: "matrix-neodatefix-bot"
chart: "opendesk-matrix-widgets-repo/matrix-neodatefix-bot" chart: "opendesk-matrix-widgets-repo/matrix-neodatefix-bot"
@@ -114,6 +124,7 @@ releases:
- "values-matrix-neodatefix-bot.yaml" - "values-matrix-neodatefix-bot.yaml"
- "values-matrix-neodatefix-bot.gotmpl" - "values-matrix-neodatefix-bot.gotmpl"
condition: "element.enabled" condition: "element.enabled"
timeout: 900
commonLabels: commonLabels:
deploy-stage: "component-1" deploy-stage: "component-1"

View File

@@ -24,7 +24,7 @@ repositories:
releases: releases:
- name: "opendesk-nextcloud-bootstrap" - name: "opendesk-nextcloud-bootstrap"
chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap" chart: "opendesk-nextcloud-bootstrap-repo/opendesk-nextcloud-bootstrap"
version: "3.1.2" version: "3.2.2"
wait: true wait: true
waitForJobs: true waitForJobs: true
values: values:

View File

@@ -44,6 +44,18 @@ externalDatabase:
metrics: metrics:
enabled: false enabled: false
nextcloud:
configs:
mimetypealiases.json: |-
{
"application/x-drawio": "image"
}
mimetypemapping.json: |-
{
"drawio": ["application/x-drawio"]
}
# this is not documented but can be found in values.yaml # this is not documented but can be found in values.yaml
service: service:
port: "80" port: "80"

View File

@@ -12,7 +12,7 @@ repositories:
releases: releases:
- name: "xwiki" - name: "xwiki"
chart: "xwiki-repo/xwiki" chart: "xwiki-repo/xwiki"
version: "1.1.3" version: "1.2.3"
wait: true wait: true
values: values:
- "values.yaml" - "values.yaml"

View File

@@ -1,6 +1,31 @@
# SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS" # SPDX-FileCopyrightText: 2023 Bundesministerium des Innern und für Heimat, PG ZenDiS "Projektgruppe für Aufbau ZenDiS"
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
--- ---
containerSecurityContext:
enabled: true
customConfigs:
xwiki.cfg:
xwiki.url.protocol: "https"
## 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"
## Enable the synchronization of the LDAP profile picture
# xwiki.authentication.ldap.update_photo: 1
xwiki.properties:
oidc.scope: "openid,profile,email,address,phoenix"
oidc.endpoint.userinfo.method: "GET"
oidc.user.nameFormater: "${oidc.user.phoenixusername._lowerCase}"
oidc.user.subjectFormater: "${oidc.user.subject}"
# yamllint disable-line rule:line-length
oidc.userinfoclaims: "xwiki_user_accessibility,xwiki_user_company,xwiki_user_displayHiddenDocuments,xwiki_user_editor,xwiki_user_usertype"
oidc.clientid: "xwiki"
oidc.endpoint.token.auth_method: "client_secret_basic"
oidc.skipped: false
oidc.logoutMechanism: "rpInitiated"
image: image:
pullPolicy: "IfNotPresent" pullPolicy: "IfNotPresent"
@@ -15,9 +40,8 @@ ingress:
istio: istio:
enabled: false enabled: false
service: mariadb:
externalPort: 80 enabled: false
enabled: true
mysql: mysql:
enabled: false enabled: false
@@ -25,14 +49,11 @@ mysql:
postgresql: postgresql:
enabled: false enabled: false
mariadb:
enabled: false
properties: properties:
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.colorTheme": "FlamingoThemes.Iceberg" "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.colorTheme": "FlamingoThemes.Iceberg"
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.default_language": "de_DE" "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.default_language": "de"
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.timezone": "Europe/Berlin" "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.timezone": "Europe/Berlin"
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.languages": "de_DE" "property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.languages": "de"
"property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.link-color": "@brand-primary" "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.link-color": "@brand-primary"
"property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.btn-primary-bg": "@brand-primary" "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.btn-primary-bg": "@brand-primary"
"property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.navbar-default-color": "@brand-primary" "property:xwiki:FlamingoThemes.Iceberg^FlamingoThemesCode.ThemeClass.navbar-default-color": "@brand-primary"
@@ -62,25 +83,13 @@ properties:
# "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter": # "property:xwiki:LDAPUserImport.WebHome^LDAPUserImport.LDAPUserImportConfigClass.ldapGroupImportSearchFilter":
# "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))" # "(&(objectClass=opendeskKnowledgemanagementGroup)(opendeskKnowledgemanagementEnabled=TRUE))"
customConfigs: securityContext:
xwiki.cfg: enabled: true
xwiki.url.protocol: "https"
## 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"
## Enable the synchronization of the LDAP profile picture
# xwiki.authentication.ldap.update_photo: 1
xwiki.properties: service:
oidc.scope: "openid,profile,email,address,phoenix" externalPort: 80
oidc.endpoint.userinfo.method: "GET" enabled: true
oidc.user.nameFormater: "${oidc.user.phoenixusername._lowerCase}"
oidc.user.subjectFormater: "${oidc.user.subject}" volumePermissions:
# yamllint disable-line rule:line-length enabled: true
oidc.userinfoclaims: "xwiki_user_accessibility,xwiki_user_company,xwiki_user_displayHiddenDocuments,xwiki_user_editor,xwiki_user_usertype"
oidc.clientid: "xwiki"
oidc.endpoint.token.auth_method: "client_secret_basic"
oidc.skipped: false
oidc.logoutMechanism: "rpInitiated"
... ...

View File

@@ -16,7 +16,7 @@ images:
# @supplier: "Open-Xchange" # @supplier: "Open-Xchange"
element: element:
repository: "souvap/tooling/images/element-web" repository: "souvap/tooling/images/element-web"
tag: "1.3.0@sha256:25bd7d731dc501cd00fac61c9db8807b635d1150a99067137b7fb290981ec8f8" tag: "1.4.0@sha256:81fd60c8feba4cfc65de3cf950d4b5ca724cabcc46da279edec74af192ecff00"
# @supplier: "Element" # @supplier: "Element"
freshclam: freshclam:
repository: "clamav/clamav" repository: "clamav/clamav"
@@ -82,7 +82,7 @@ images:
# @supplier: "openDesk DevSecOps" # @supplier: "openDesk DevSecOps"
matrixNeoBoardWidget: matrixNeoBoardWidget:
repository: "nordeck/matrix-neoboard-widget" repository: "nordeck/matrix-neoboard-widget"
tag: "0.4.0@sha256:c5e72409a0edc1962e9be618fcb83acce19e64c0c645075d8ff0ccde06e93fc7" tag: "1.0.0@sha256:584b9c18ea3dfd4b7f1e73f3e114bc1dcd5731b400a8d037576bf2a797c8b086"
# @supplier: "Nordeck" # @supplier: "Nordeck"
matrixNeoChoiceWidget: matrixNeoChoiceWidget:
repository: "nordeck/matrix-poll-widget" repository: "nordeck/matrix-poll-widget"
@@ -90,11 +90,11 @@ images:
# @supplier: "Nordeck" # @supplier: "Nordeck"
matrixNeoDateFixBot: matrixNeoDateFixBot:
repository: "nordeck/matrix-meetings-bot" repository: "nordeck/matrix-meetings-bot"
tag: "2.4.0@sha256:d6560841c3708bd8b55623ef70dd55bf4792da6ed6cd5026c37a5e4df7c8a3a3" tag: "2.4.2@sha256:f5b3362560255470076f3e6c95a0dd93a8f781398afb992c1e1212764fa87297"
# @supplier: "Nordeck" # @supplier: "Nordeck"
matrixNeoDateFixWidget: matrixNeoDateFixWidget:
repository: "nordeck/matrix-meetings-widget" repository: "nordeck/matrix-meetings-widget"
tag: "1.5.1@sha256:a518c194fa1b8cf2886c02623d883810f166f27259ce7d4e0138b962dea565e7" tag: "1.5.2@sha256:cc9e2592c9159cc8f6bed96dae0be6e6fe599977dbef64cbdb1c1b84db85a2bb"
# @supplier: "Nordeck" # @supplier: "Nordeck"
matrixUserVerificationService: matrixUserVerificationService:
repository: "matrixdotorg/matrix-user-verification-service" repository: "matrixdotorg/matrix-user-verification-service"
@@ -268,13 +268,12 @@ images:
tag: "1.25.2-bookworm@sha256:9504f3f64a3f16f0eaf9adca3542ff8b2a6880e6abfb13e478cca23f6380080a" tag: "1.25.2-bookworm@sha256:9504f3f64a3f16f0eaf9adca3542ff8b2a6880e6abfb13e478cca23f6380080a"
# @supplier: "Element" # @supplier: "Element"
xwiki: xwiki:
repository: "xwikisas/swp/xwiki"
tag: "0.11-mariadb-jetty-alpine@sha256:a334e18d171458ed41ef356e82580561f48b0edf60b4979dc4ed9503eb497c59"
# @supplier: "XWiki"
xwikiTomcat:
# This is legacy and not part of the standard deployment.
repository: "xwikisas/swp/xwiki" repository: "xwikisas/swp/xwiki"
tag: "0.10-mariadb-tomcat@sha256:02f0ff6407ccdd8dab17814202e28991fe0aa8d44fa106ba171cff5249eaf58f" tag: "0.10-mariadb-tomcat@sha256:02f0ff6407ccdd8dab17814202e28991fe0aa8d44fa106ba171cff5249eaf58f"
# @supplier: "XWiki" # @supplier: "XWiki"
xwikiJetty:
# This is a preview and not part of the standard deployment.
repository: "xwikisas/swp/xwiki"
tag: "0.11-SNAPSHOT-mariadb-jetty-alpine"
# @supplier: "XWiki"
... ...

View File

@@ -11,7 +11,7 @@ persistence:
mariadb: "1Gi" mariadb: "1Gi"
matrixNeoDateFixBot: "1Gi" matrixNeoDateFixBot: "1Gi"
nextcloud: nextcloud:
main: "1Gi" main: "1.2Gi"
data: "10Gi" data: "10Gi"
openproject: "1Gi" openproject: "1Gi"
postfix: "1Gi" postfix: "1Gi"