mirror of
https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git
synced 2025-12-06 23:41:43 +01:00
Compare commits
8 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
152b4fb7b5 | ||
|
|
53948eae76 | ||
|
|
48a87fb839 | ||
|
|
b8a8932221 | ||
|
|
37876a5a96 | ||
|
|
3a0b246f83 | ||
|
|
d82e03f1ae | ||
|
|
27ce71554d |
@@ -127,8 +127,7 @@ variables:
|
|||||||
- "yes"
|
- "yes"
|
||||||
- "no"
|
- "no"
|
||||||
TESTS_PROJECT_URL:
|
TESTS_PROJECT_URL:
|
||||||
description: "URL of the E2E-test gitlab project API with project ID."
|
description: "URL of the E2E-test Gitlab project API with project ID."
|
||||||
value: "gitlab.souvap-univention.de/api/v4/projects/6"
|
|
||||||
# please use the following set of variables with normalized names:
|
# please use the following set of variables with normalized names:
|
||||||
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
|
DOMAIN: "${NAMESPACE}.${CLUSTER}.${BASE_DOMAIN}"
|
||||||
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
|
ISTIO_DOMAIN: "${NAMESPACE}.istio.${CLUSTER}.${BASE_DOMAIN}"
|
||||||
@@ -192,7 +191,7 @@ env-cleanup:
|
|||||||
env-start:
|
env-start:
|
||||||
environment:
|
environment:
|
||||||
name: "${NAMESPACE}"
|
name: "${NAMESPACE}"
|
||||||
url: "https://portal.${NAMESPACE}.${SWP_DOMAIN}"
|
url: "https://portal.${DOMAIN}"
|
||||||
on_stop: "env-stop"
|
on_stop: "env-stop"
|
||||||
extends: ".deploy-common"
|
extends: ".deploy-common"
|
||||||
image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"
|
image: "${CI_DEPENDENCY_PROXY_GROUP_IMAGE_PREFIX}/alpine/k8s:1.25.6"
|
||||||
|
|||||||
28
CHANGELOG.md
28
CHANGELOG.md
@@ -1,3 +1,31 @@
|
|||||||
|
## [0.0.6](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.5...v0.0.6) (2023-08-14)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **open-xchange:** Functional mailboxes auth settings update in AppSuite and Dovecot ([53948ea](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/commit/53948eae7648cc9785d2b8a813fc7e40b36aa3aa))
|
||||||
|
|
||||||
|
## [0.0.5](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.4...v0.0.5) (2023-08-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **keycloak:** Improve digest image pinning ([b8a8932](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/commit/b8a8932221ae4d6632c7d1f4a85f46fea01a92e7))
|
||||||
|
|
||||||
|
## [0.0.4](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.3...v0.0.4) (2023-08-11)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **jitsi:** Fix identifiers in resources ([3a0b246](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/commit/3a0b246f83dc6a3ff19973959b3cf3c243c39025))
|
||||||
|
|
||||||
|
## [0.0.3](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.2...v0.0.3) (2023-08-10)
|
||||||
|
|
||||||
|
|
||||||
|
### Bug Fixes
|
||||||
|
|
||||||
|
* **keycloak:** Keycloak extensions sha256 image pinning, includes fix for failing keycloak extension handler on unavailable SMTP relay. ([27ce715](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/commit/27ce71554d5f495731d90632a56e134762b95a25))
|
||||||
|
|
||||||
## [0.0.2](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.1...v0.0.2) (2023-08-10)
|
## [0.0.2](https://gitlab.souvap-univention.de/souvap/devops/sovereign-workplace/compare/v0.0.1...v0.0.2) (2023-08-10)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ jitsi:
|
|||||||
extraEnvs:
|
extraEnvs:
|
||||||
TURN_ENABLE: "1"
|
TURN_ENABLE: "1"
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openproject | toYaml | nindent 6 }}
|
{{ .Values.resources.jitsi | toYaml | nindent 6 }}
|
||||||
prosody:
|
prosody:
|
||||||
image:
|
image:
|
||||||
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.prosody.repository }}"
|
repository: "{{ .Values.global.imageRegistry }}/{{ .Values.images.prosody.repository }}"
|
||||||
@@ -69,7 +69,7 @@ jitsi:
|
|||||||
- name: TURN_CREDENTIALS
|
- name: TURN_CREDENTIALS
|
||||||
value: "{{ .Values.turn.credentials }}"
|
value: "{{ .Values.turn.credentials }}"
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openproject | toYaml | nindent 6 }}
|
{{ .Values.resources.prosody | toYaml | nindent 6 }}
|
||||||
persistence:
|
persistence:
|
||||||
size: "{{ .Values.persistence.size.prosody }}"
|
size: "{{ .Values.persistence.size.prosody }}"
|
||||||
storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}"
|
storageClassName: "{{ .Values.persistence.storageClassNames.RWO }}"
|
||||||
@@ -82,7 +82,7 @@ jitsi:
|
|||||||
password: "{{ .Values.secrets.jitsiPlain.jicofoAuthPassword }}"
|
password: "{{ .Values.secrets.jitsiPlain.jicofoAuthPassword }}"
|
||||||
componentSecret: "{{ .Values.secrets.jitsiPlain.jicofoComponentPassword }}"
|
componentSecret: "{{ .Values.secrets.jitsiPlain.jicofoComponentPassword }}"
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openproject | toYaml | nindent 6 }}
|
{{ .Values.resources.jicofo | toYaml | nindent 6 }}
|
||||||
jvb:
|
jvb:
|
||||||
replicaCount: {{ .Values.replicas.jvb }}
|
replicaCount: {{ .Values.replicas.jvb }}
|
||||||
image:
|
image:
|
||||||
@@ -91,7 +91,7 @@ jitsi:
|
|||||||
xmpp:
|
xmpp:
|
||||||
password: "{{ .Values.secrets.jitsiPlain.jvbAuthPassword }}"
|
password: "{{ .Values.secrets.jitsiPlain.jvbAuthPassword }}"
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openproject | toYaml | nindent 6 }}
|
{{ .Values.resources.jvb | toYaml | nindent 6 }}
|
||||||
service:
|
service:
|
||||||
type: "{{ .Values.cluster.service.type }}"
|
type: "{{ .Values.cluster.service.type }}"
|
||||||
jibri:
|
jibri:
|
||||||
@@ -104,7 +104,7 @@ jitsi:
|
|||||||
xmpp:
|
xmpp:
|
||||||
password: "{{ .Values.secrets.jitsiPlain.jibriXmppPassword }}"
|
password: "{{ .Values.secrets.jitsiPlain.jibriXmppPassword }}"
|
||||||
resources:
|
resources:
|
||||||
{{ .Values.resources.openproject | toYaml | nindent 6 }}
|
{{ .Values.resources.jibri | toYaml | nindent 6 }}
|
||||||
imagePullSecrets:
|
imagePullSecrets:
|
||||||
{{- range .Values.global.imagePullSecrets }}
|
{{- range .Values.global.imagePullSecrets }}
|
||||||
- name: {{ . }}
|
- name: {{ . }}
|
||||||
|
|||||||
@@ -15,6 +15,15 @@ global:
|
|||||||
username: "{{ .Values.databases.keycloakExtension.username }}"
|
username: "{{ .Values.databases.keycloakExtension.username }}"
|
||||||
password: {{ .Values.databases.keycloakExtension.password | default .Values.secrets.postgresql.keycloakExtensionUser }}
|
password: {{ .Values.databases.keycloakExtension.password | default .Values.secrets.postgresql.keycloakExtensionUser }}
|
||||||
handler:
|
handler:
|
||||||
|
image:
|
||||||
|
registry: "{{ .Values.global.imageRegistry }}"
|
||||||
|
repository: "{{ .Values.images.keycloakExtensionHandler.repository }}"
|
||||||
|
{{- if .Values.images.keycloakExtensionHandler.digest }}
|
||||||
|
sha256: "{{ .Values.images.keycloakExtensionHandler.digest}}"
|
||||||
|
{{- else if .Values.images.keycloakExtensionHandler.tag }}
|
||||||
|
tag: "{{ .Values.images.keycloakExtensionHandler.tag }}"
|
||||||
|
{{- end }}
|
||||||
|
imagePullPolicy: "Always"
|
||||||
appConfig:
|
appConfig:
|
||||||
smtpPassword: "{{ .Values.smtp.password }}"
|
smtpPassword: "{{ .Values.smtp.password }}"
|
||||||
smtpHost: "{{ .Values.smtp.host }}"
|
smtpHost: "{{ .Values.smtp.host }}"
|
||||||
@@ -25,8 +34,12 @@ handler:
|
|||||||
proxy:
|
proxy:
|
||||||
image:
|
image:
|
||||||
registry: "{{ .Values.global.imageRegistry }}"
|
registry: "{{ .Values.global.imageRegistry }}"
|
||||||
repository: "{{ .Values.images.keycloakExtension.repository }}"
|
repository: "{{ .Values.images.keycloakExtensionProxy.repository }}"
|
||||||
tag: "{{ .Values.images.keycloakExtension.tag }}"
|
{{- if .Values.images.keycloakExtensionProxy.digest }}
|
||||||
|
sha256: "{{ .Values.images.keycloakExtensionProxy.digest}}"
|
||||||
|
{{- else if .Values.images.keycloakExtensionProxy.tag }}
|
||||||
|
tag: "{{ .Values.images.keycloakExtensionProxy.tag }}"
|
||||||
|
{{- end }}
|
||||||
imagePullPolicy: "Always"
|
imagePullPolicy: "Always"
|
||||||
ingress:
|
ingress:
|
||||||
enabled: "{{ .Values.ingress.enabled }}"
|
enabled: "{{ .Values.ingress.enabled }}"
|
||||||
|
|||||||
@@ -9,8 +9,6 @@ global:
|
|||||||
realm: "souvap"
|
realm: "souvap"
|
||||||
|
|
||||||
handler:
|
handler:
|
||||||
image:
|
|
||||||
tag: "latest"
|
|
||||||
appConfig:
|
appConfig:
|
||||||
captchaProtectionEnable: "False"
|
captchaProtectionEnable: "False"
|
||||||
|
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ repositories:
|
|||||||
releases:
|
releases:
|
||||||
- name: "dovecot"
|
- name: "dovecot"
|
||||||
chart: "dovecot/dovecot"
|
chart: "dovecot/dovecot"
|
||||||
version: "1.2.0"
|
version: "1.3.1"
|
||||||
values:
|
values:
|
||||||
- "values-dovecot.yaml"
|
- "values-dovecot.yaml"
|
||||||
- "values-dovecot.gotmpl"
|
- "values-dovecot.gotmpl"
|
||||||
|
|||||||
@@ -65,6 +65,7 @@ appsuite:
|
|||||||
com.openexchange.capability.smime: "true"
|
com.openexchange.capability.smime: "true"
|
||||||
# Secondary Accounts
|
# Secondary Accounts
|
||||||
com.openexchange.mail.secondary.authType: "XOAUTH2"
|
com.openexchange.mail.secondary.authType: "XOAUTH2"
|
||||||
|
com.openexchange.mail.transport.secondary.authType: "xoauth2"
|
||||||
# Nextcloud integration
|
# Nextcloud integration
|
||||||
com.openexchange.file.storage.nextcloud.oauth.url: "http://nextcloud/"
|
com.openexchange.file.storage.nextcloud.oauth.url: "http://nextcloud/"
|
||||||
com.openexchange.file.storage.nextcloud.oauth.webdav.username.strategy: "user"
|
com.openexchange.file.storage.nextcloud.oauth.webdav.username.strategy: "user"
|
||||||
|
|||||||
@@ -47,9 +47,12 @@ images:
|
|||||||
keycloakBootstrap:
|
keycloakBootstrap:
|
||||||
repository: "souvap/tooling/images/ansible"
|
repository: "souvap/tooling/images/ansible"
|
||||||
tag: "4.10.0"
|
tag: "4.10.0"
|
||||||
keycloakExtension:
|
keycloakExtensionHandler:
|
||||||
|
repository: "souvap/tooling/images/keycloak-extensions/keycloak-handler"
|
||||||
|
digest: "cdaaab8fb1b658ee2ca45557e76570153bb306c43061db5b5ee0f418c40e2200"
|
||||||
|
keycloakExtensionProxy:
|
||||||
repository: "souvap/tooling/images/keycloak-extensions/keycloak-proxy"
|
repository: "souvap/tooling/images/keycloak-extensions/keycloak-proxy"
|
||||||
tag: "latest"
|
digest: "15ad665620368178d98721c0bd91744dd9c965c2e470abc3838e353fff530093"
|
||||||
mariadb:
|
mariadb:
|
||||||
repository: "mariadb"
|
repository: "mariadb"
|
||||||
tag: "10"
|
tag: "10"
|
||||||
@@ -105,8 +108,8 @@ images:
|
|||||||
repository: "bitnami/redis"
|
repository: "bitnami/redis"
|
||||||
tag: "7.0.12-debian-11-r0"
|
tag: "7.0.12-debian-11-r0"
|
||||||
univentionCorporateServer:
|
univentionCorporateServer:
|
||||||
repository: "souvap/tooling/images/univention-corporate-server-swp/ucs"
|
repository: "souvap/tooling/images/univention-corporate-server-swp/ucs@sha256"
|
||||||
tag: "20230806T234258"
|
tag: "286503f13726399284b49d4521f45fdbed81216875d78e76dcae20e0d8301f65"
|
||||||
xwiki:
|
xwiki:
|
||||||
repository: "xwikisas/swp/xwiki"
|
repository: "xwikisas/swp/xwiki"
|
||||||
tag: "0.8-mariadb-tomcat"
|
tag: "0.8-mariadb-tomcat"
|
||||||
|
|||||||
Reference in New Issue
Block a user