sheppy/opendesk
1
0
Fork 0
mirror of https://gitlab.opencode.de/bmi/opendesk/deployment/opendesk.git synced 2025-12-06 07:21:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(helmfile): Introduce apps as top level in opendesk_main.yaml.gotmpl; Please check migrations.md for upgrades of existing installations

Browse Source
This commit is contained in:
Thorsten Roßner
2025-01-29 09:54:29 +01:00
parent c51c92536a
commit 2fcf014894
38 changed files with 346 additions and 294 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
.gitlab-ci.yml
View File

@@ -73,6 +73,12 @@ variables:
options:
- "yes"
- "no"
OPENDESK_ENTERPRISE:
description: "Set to `true` if you want to deploy openDesk EE (but be sure you provide the required EE keys/tokens for the application)"
value: "false"
options:
- "true"
- "false"
DEPLOY_ALL_COMPONENTS:
description: "Enable all component deployment (overwrites 'no' setting on component level)."
value: "no"
@@ -286,7 +292,7 @@ env-start:
after_script:
# Set credentials for openDesk Enterprise Registry
- |
if [[ -n "${OPENDESK_ENTERPRISE}" ]]; then
if [ "${OPENDESK_ENTERPRISE}" = "true" ]; then
kubectl create secret
--namespace "${NAMESPACE}"
docker-registry enterprise-registry
@@ -575,6 +581,7 @@ run-tests:
\"screenshot_redirect_step\": \"yes\", \
\"testset\": \"${TESTS_TESTSET}\", \
\"testprofile\": \"Namespace\", \
\"OPENDESK_ENTERPRISE\": \"${OPENDESK_ENTERPRISE}\", \
\"GRACE_PERIOD\": \"${TESTS_GRACE_PERIOD}\", \
\"NUMBER_OF_THREADS\": \"${TESTS_NUMBER_OF_THREADS}\" \
} \

4
README-EE.md
View File

@@ -38,10 +38,10 @@ The following components have - at least partially - Enterprise specific artifac
# Enabling the Enterprise deployment
To enable the oD EE deployment you must set the environment variable `OPENDESK_ENTERPRISE` to any value.
To enable the oD EE deployment you must set the environment variable `OPENDESK_ENTERPRISE` to any value that does not evaluate to boolean *false* for [Helm flow control](https://helm.sh/docs/chart_template_guide/control_structures/#ifelse), e.g. `"true"`, `"yes"` or `"1"`:
```shell
OPENDESK_ENTERPRISE=any_value
OPENDESK_ENTERPRISE=true
```
# Configuring the oD EE deployment for self-hosted installations

34
docs/migrations.md
View File

@@ -9,6 +9,9 @@ SPDX-License-Identifier: Apache-2.0
* [Disclaimer](#disclaimer)
* [Automated migrations - Overview and mandatory upgrade path](#automated-migrations---overview-and-mandatory-upgrade-path)
* [Manual checks/actions](#manual-checksactions)
* [From v1.1.1](#from-v111)
* [Pre-upgrade from v1.1.1](#pre-upgrade-from-v111)
* [Helmfile feature update: App settings wrapped in `apps.` element](#helmfile-feature-update-app-settings-wrapped-in-apps-element)
* [From v1.1.0](#from-v110)
* [Pre-upgrade from v1.1.0](#pre-upgrade-from-v110)
* [Helmfile feature update: Component specific `storageClassName`](#helmfile-feature-update-component-specific-storageclassname)
@@ -86,6 +89,37 @@ When interested in more details about the automated migrations, please read sect
Be sure you check all the sections for the releases your are going to update your current deployment from.
## From v1.1.1
### Pre-upgrade from v1.1.1
#### Helmfile feature update: App settings wrapped in `apps.` element
We require now [Helmfile v1.0.0-rc.8](https://github.com/helmfile/helmfile/releases/tag/v1.0.0-rc.8) for the deployment. This enables openDesk to lay the foundation for some significant cleanups where the information for the different apps especially on their `enabled` state is needed.
Therefore it was required to introduce the `apps` level in [`opendesk_main.yaml.gotmpl`](../helmfile/environments/default/opendesk_main.yaml.gotmpl).
If you have a deployment where you specify settings that can be found in the aforementioned file, usually to disable components or enable others, please ensure you insert the top-level attribute `apps` like shown in the following example:
So a setting of:
```
certificates:
enabled: false
notes:
enabled: true
```
needs to be changed to:
```
apps:
certificates:
enabled: false
notes:
enabled: true
```
## From v1.1.0
### Pre-upgrade from v1.1.0

2
docs/requirements.md
View File

@@ -26,7 +26,7 @@ openDesk is a Kubernetes-only solution and requires an existing Kubernetes (K8s)
- Domain and DNS Service
- Ingress controller (Ingress NGINX)
- [Helm](https://helm.sh/) >= v3.9.0
- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= **v1.0.0-rc5**
- [Helmfile](https://helmfile.readthedocs.io/en/latest/) >= **v1.0.0-rc8**
- [HelmDiff](https://github.com/databus23/helm-diff) >= 3.6.0
- Volume provisioner supporting RWO (read-write-once)
- Certificate handling with [cert-manager](https://cert-manager.io/)

8
helmfile/apps/collabora/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.collabora.registry }}/{{ .Values.charts.collabora.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.collabora.registry }}/{{ .Values.charts.collabora.repository }}"
# Collabora Controller - Enterprise Only
# Source: https://github.com/CollaboraOnline/online
@@ -20,7 +20,7 @@ repositories:
username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.collaboraController.registry }}/{{ .Values.charts.collaboraController.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.collaboraController.registry }}/{{ .Values.charts.collaboraController.repository }}"
releases:
- name: "collabora-online"
@@ -34,7 +34,7 @@ releases:
{{- range .Values.customization.release.collaboraOnline }}
- {{ . }}
{{- end }}
installed: {{ .Values.collabora.enabled }}
installed: {{ .Values.apps.collabora.enabled }}
- name: "collabora-controller"
chart: "collabora-controller-repo/{{ .Values.charts.collaboraController.name }}"
version: "{{ .Values.charts.collaboraController.version }}"
@@ -45,7 +45,7 @@ releases:
{{- range .Values.customization.release.collaboraController }}
- {{ . }}
{{- end }}
installed: {{ .Values.collaboraController.enabled }}
installed: {{ .Values.apps.collaboraController.enabled }}
commonLabels:
deployStage: "050-components"

2
helmfile/apps/collabora/values-coco-enterprise.yaml.gotmpl
View File

@@ -12,7 +12,7 @@ controller:
# Therefore we use the default of `collabora-online` for the `resourceName`
resourceName: "collabora-online"
statsInterval: 2000
watchNamespace: {{ (.Values.collabora.namespace | default .Release.Namespace | quote) }}
watchNamespace: {{ (.Values.apps.collabora.namespace | default .Release.Namespace | quote) }}
documentMigrator:
enabled: true

2
helmfile/apps/collabora/values-enterprise.yaml.gotmpl
View File

@@ -6,7 +6,7 @@ SPDX-License-Identifier: Apache-2.0
image:
repository: "{{ coalesce .Values.repositories.image.registryOpencodeDeEnterprise .Values.global.imageRegistry .Values.images.collabora.registry }}/{{ .Values.images.collabora.repository }}"
autoscaling:
enabled: {{ .Values.collaboraController.enabled }}
enabled: {{ .Values.apps.collaboraController.enabled }}
minReplicas: {{ .Values.enterpriseFeatures.collabora.autoscaling.minReplicas }}
maxReplicas: {{ .Values.enterpriseFeatures.collabora.autoscaling.maxReplicas }}
targetMemoryUtilizationPercentage: {{ .Values.enterpriseFeatures.collabora.autoscaling.targetMemoryUtilizationPercentage }}

4
helmfile/apps/collabora/values.yaml.gotmpl
View File

@@ -27,7 +27,7 @@ collabora:
{{- else }}
--o:logging.anonymize.anonymize_user_data=true
{{- end }}
{{- if .Values.collaboraController.enabled }}
{{- if .Values.apps.collaboraController.enabled }}
--o:indirection_endpoint.url=https://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/routeToken
--o:monitors.monitor[0]=wss://{{ .Values.global.hosts.collabora }}.{{ .Values.global.domain }}/controller/ws
--o:monitors.monitor[0][@retryInterval]=5
@@ -49,7 +49,7 @@ imagePullSecrets:
ingress:
annotations:
{{- if .Values.collaboraController.enabled }}
{{- if .Values.apps.collaboraController.enabled }}
nginx.ingress.kubernetes.io/upstream-hash-by: "$arg_RouteToken"
{{- else }}
nginx.ingress.kubernetes.io/upstream-hash-by: "$arg_WOPISrc"

4
helmfile/apps/cryptpad/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.cryptpad.registry }}/{{ .Values.charts.cryptpad.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.cryptpad.registry }}/{{ .Values.charts.cryptpad.repository }}"
releases:
- name: "cryptpad"
@@ -21,7 +21,7 @@ releases:
{{- range .Values.customization.release.cryptpad }}
- {{ . }}
{{- end }}
installed: {{ .Values.cryptpad.enabled }}
installed: {{ .Values.apps.cryptpad.enabled }}
commonLabels:
deployStage: "050-components"

64
helmfile/apps/element/helmfile-child.yaml.gotmpl
View File

@@ -10,35 +10,35 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.element.registry }}/{{ .Values.charts.element.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.element.registry }}/{{ .Values.charts.element.repository }}"
- name: "element-well-known-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.elementWellKnown.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.elementWellKnown.registry }}/{{ .Values.charts.elementWellKnown.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.elementWellKnown.registry }}/{{ .Values.charts.elementWellKnown.repository }}"
- name: "synapse-web-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapseWeb.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapseWeb.registry }}/{{ .Values.charts.synapseWeb.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.synapseWeb.registry }}/{{ .Values.charts.synapseWeb.repository }}"
- name: "synapse-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapse.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapse.registry }}/{{ .Values.charts.synapse.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.synapse.registry }}/{{ .Values.charts.synapse.repository }}"
- name: "synapse-create-account-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapseCreateAccount.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapseCreateAccount.registry }}/{{ .Values.charts.synapseCreateAccount.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.synapseCreateAccount.registry }}/{{ .Values.charts.synapseCreateAccount.repository }}"
# openDesk Matrix Widgets
# Source: https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-matrix-widgets
@@ -48,35 +48,35 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixUserVerificationService.registry }}/{{ .Values.charts.matrixUserVerificationService.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.matrixUserVerificationService.registry }}/{{ .Values.charts.matrixUserVerificationService.repository }}"
- name: "matrix-neoboard-widget-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.matrixNeoboardWidget.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixNeoboardWidget.registry }}/{{ .Values.charts.matrixNeoboardWidget.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.matrixNeoboardWidget.registry }}/{{ .Values.charts.matrixNeoboardWidget.repository }}"
- name: "matrix-neochoice-widget-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.matrixNeoboardWidget.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixNeoboardWidget.registry }}/{{ .Values.charts.matrixNeoboardWidget.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.matrixNeoboardWidget.registry }}/{{ .Values.charts.matrixNeoboardWidget.repository }}"
- name: "matrix-neodatefix-widget-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.matrixNeodatefixWidget.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixNeodatefixWidget.registry }}/{{ .Values.charts.matrixNeodatefixWidget.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.matrixNeodatefixWidget.registry }}/{{ .Values.charts.matrixNeodatefixWidget.repository }}"
- name: "matrix-neodatefix-bot-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.matrixNeodatefixBot.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixNeodatefixBot.registry }}/{{ .Values.charts.matrixNeodatefixBot.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.matrixNeodatefixBot.registry }}/{{ .Values.charts.matrixNeodatefixBot.repository }}"
# openDesk Enterprise Repositories
@@ -88,28 +88,28 @@ repositories:
username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapseAdmin.registry }}/{{ .Values.charts.synapseAdmin.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.synapseAdmin.registry }}/{{ .Values.charts.synapseAdmin.repository }}"
- name: "synapse-adminbot-web-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapseAdminbotWeb.verify }}
username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapseAdminbotWeb.registry }}/{{ .Values.charts.synapseAdminbotWeb.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.synapseAdminbotWeb.registry }}/{{ .Values.charts.synapseAdminbotWeb.repository }}"
- name: "synapse-groupsync-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapseGroupsync.verify }}
username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapseGroupsync.registry }}/{{ .Values.charts.synapseGroupsync.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.synapseGroupsync.registry }}/{{ .Values.charts.synapseGroupsync.repository }}"
- name: "synapse-pipe-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.synapsePipe.verify }}
username: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.synapsePipe.registry }}/{{ .Values.charts.synapsePipe.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.synapsePipe.registry }}/{{ .Values.charts.synapsePipe.repository }}"
releases:
- name: "opendesk-element"
@@ -120,7 +120,7 @@ releases:
{{- range .Values.customization.release.opendeskElement }}
- {{ . }}
{{- end }}
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "opendesk-well-known"
@@ -131,7 +131,7 @@ releases:
{{- range .Values.customization.release.opendeskWellKnown }}
- {{ . }}
{{- end }}
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "opendesk-synapse-web"
@@ -142,7 +142,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseWeb }}
- {{ . }}
{{- end }}
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "opendesk-synapse"
@@ -153,7 +153,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapse }}
- {{ . }}
{{- end }}
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "opendesk-matrix-user-verification-service-bootstrap"
@@ -161,7 +161,7 @@ releases:
version: "{{ .Values.charts.synapseCreateAccount.version }}"
values:
- "values-matrix-user-verification-service-bootstrap.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "opendesk-matrix-user-verification-service"
@@ -169,7 +169,7 @@ releases:
version: "{{ .Values.charts.matrixUserVerificationService.version }}"
values:
- "values-matrix-user-verification-service.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "matrix-neoboard-widget"
@@ -177,7 +177,7 @@ releases:
version: "{{ .Values.charts.matrixNeoboardWidget.version }}"
values:
- "values-matrix-neoboard-widget.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "matrix-neochoice-widget"
@@ -185,7 +185,7 @@ releases:
version: "{{ .Values.charts.matrixNeochoiseWidget.version }}"
values:
- "values-matrix-neochoice-widget.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "matrix-neodatefix-widget"
@@ -193,7 +193,7 @@ releases:
version: "{{ .Values.charts.matrixNeodatefixWidget.version }}"
values:
- "values-matrix-neodatefix-widget.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "matrix-neodatefix-bot-bootstrap"
@@ -201,7 +201,7 @@ releases:
version: "{{ .Values.charts.synapseCreateAccount.version }}"
values:
- "values-matrix-neodatefix-bot-bootstrap.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
- name: "matrix-neodatefix-bot"
@@ -209,7 +209,7 @@ releases:
version: "{{ .Values.charts.matrixNeodatefixBot.version }}"
values:
- "values-matrix-neodatefix-bot.yaml.gotmpl"
installed: {{ .Values.element.enabled }}
installed: {{ .Values.apps.element.enabled }}
timeout: 900
# openDesk Enterprise Releases
@@ -221,7 +221,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAdmin }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-adminbot-bootstrap"
@@ -232,7 +232,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAdminbotBootstrap }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-adminbot-pipe"
@@ -243,7 +243,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAdminbotPipe }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-adminbot-web"
@@ -254,7 +254,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAdminbotWeb }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-auditbot-bootstrap"
@@ -265,7 +265,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAuditbotBootstrap }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-auditbot-pipe"
@@ -276,7 +276,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseAuditbotPipe }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementAdmin.enabled }}
installed: {{ .Values.apps.elementAdmin.enabled }}
timeout: 900
- name: "opendesk-synapse-groupsync"
@@ -287,7 +287,7 @@ releases:
{{- range .Values.customization.release.opendeskSynapseGroupsync }}
- {{ . }}
{{- end }}
installed: {{ .Values.elementGroupsync.enabled }}
installed: {{ .Values.apps.elementGroupsync.enabled }}
timeout: 900
commonLabels:

6
helmfile/apps/element/values-synapse.yaml.gotmpl
View File

@@ -70,7 +70,7 @@ configuration:
url: null
sender_localpart: ox-appsuite
{{- if eq (env "OPENDESK_ENTERPRISE") "true" }}
{{- if .Values.elementAdmin.enabled }}
{{- if .Values.apps.elementAdmin.enabled }}
- as_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }}
hs_token: {{ .Values.secrets.matrixAdminBot.synapseAsToken | quote }}
id: "element-adminbot-pipe"
@@ -106,7 +106,7 @@ configuration:
rate_limited: false
sender_localpart: "auditbot-sendernotinuse"
{{- end }}
{{- if .Values.elementGroupsync.enabled }}
{{- if .Values.apps.elementGroupsync.enabled }}
- as_token: {{ .Values.secrets.matrixGroupsync.synapseAsToken | quote }}
hs_token: {{ .Values.secrets.matrixGroupsync.synapseAsToken | quote }}
id: "gps"
@@ -132,7 +132,7 @@ configuration:
smtp:
senderAddress: "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
port: 25
tls: false
starttls: false

4
helmfile/apps/jitsi/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.jitsi.registry }}/{{ .Values.charts.jitsi.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.jitsi.registry }}/{{ .Values.charts.jitsi.repository }}"
releases:
- name: "jitsi"
@@ -21,7 +21,7 @@ releases:
{{- range .Values.customization.release.jitsi }}
- {{ . }}
{{- end }}
installed: {{ .Values.jitsi.enabled }}
installed: {{ .Values.apps.jitsi.enabled }}
timeout: 900
commonLabels:

8
helmfile/apps/nextcloud/helmfile-child.yaml.gotmpl
View File

@@ -10,14 +10,14 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.nextcloudManagement.registry }}/{{ .Values.charts.nextcloudManagement.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nextcloudManagement.registry }}/{{ .Values.charts.nextcloudManagement.repository }}"
- name: "nextcloud-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.nextcloud.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.nextcloud.registry }}/{{ .Values.charts.nextcloud.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nextcloud.registry }}/{{ .Values.charts.nextcloud.repository }}"
releases:
- name: "opendesk-nextcloud-management"
@@ -33,7 +33,7 @@ releases:
{{- end }}
waitForJobs: true
wait: true
installed: {{ .Values.nextcloud.enabled }}
installed: {{ .Values.apps.nextcloud.enabled }}
timeout: 900
- name: "opendesk-nextcloud"
chart: "nextcloud-repo/{{ .Values.charts.nextcloud.name }}"
@@ -48,7 +48,7 @@ releases:
{{- end }}
needs:
- "opendesk-nextcloud-management"
installed: {{ .Values.nextcloud.enabled }}
installed: {{ .Values.apps.nextcloud.enabled }}
commonLabels:
deployStage: "050-components"

10
helmfile/apps/nextcloud/values-nextcloud-mgmt.yaml.gotmpl
View File

@@ -31,9 +31,9 @@ configuration:
host: {{ .Values.antivirus.icap.host | quote }}
port: {{ .Values.antivirus.icap.port | quote }}
{{- else }}
{{- if .Values.clamavDistributed.enabled }}
{{- if .Values.apps.clamavDistributed.enabled }}
host: "clamav-icap"
{{- else if .Values.clamavSimple.enabled }}
{{- else if .Values.apps.clamavSimple.enabled }}
host: "clamav-simple"
{{- end }}
port: 1344
@@ -55,13 +55,13 @@ configuration:
contacts:
enabled: false
cryptpad:
enabled: {{ .Values.cryptpad.enabled }}
enabled: {{ .Values.apps.cryptpad.enabled }}
filesZip:
enabled: true
groupfolders:
enabled: true
integrationOpenproject:
enabled: {{ .Values.openproject.enabled }}
enabled: {{ .Values.apps.openproject.enabled }}
spreed:
enabled: true
circles:
@@ -147,7 +147,7 @@ configuration:
value: ""
password:
value: ""
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
port: 25
fromAddress: {{ .Values.smtp.localpartNoReply | quote }}
mailDomain: "{{ .Values.global.domain }}"

4
helmfile/apps/notes/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.notes.registry }}/{{ .Values.charts.notes.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.notes.registry }}/{{ .Values.charts.notes.repository }}"
releases:
- name: "impress"
@@ -22,7 +22,7 @@ releases:
{{- range .Values.customization.release.notes }}
- {{ . }}
{{- end }}
installed: {{ .Values.notes.enabled }}
installed: {{ .Values.apps.notes.enabled }}
timeout: 1800
commonLabels:

16
helmfile/apps/nubus/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url:
"{{ .Values.global.helmRegistry | default .Values.charts.nubus.registry }}/{{ .Values.charts.nubus.repository }}"
"{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nubus.registry }}/{{ .Values.charts.nubus.repository }}"
# Intercom Service
# Source: https://gitlab.souvap-univention.de/souvap/tooling/charts/intercom-service
- name: "intercom-service-repo"
@@ -19,7 +19,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.intercomService.registry }}/{{ .Values.charts.intercomService.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.intercomService.registry }}/{{ .Values.charts.intercomService.repository }}"
# openDesk Keycloak Bootstrap Chart
- name: "opendesk-keycloak-bootstrap-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
@@ -27,7 +27,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskKeycloakBootstrap.registry }}/{{ .Values.charts.opendeskKeycloakBootstrap.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.opendeskKeycloakBootstrap.registry }}/{{ .Values.charts.opendeskKeycloakBootstrap.repository }}"
# NGINX S3 Gateway Chart
- name: "nginx-s3-gateway-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
@@ -35,7 +35,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.nginxS3Gateway.registry }}/{{ .Values.charts.nginxS3Gateway.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.nginxS3Gateway.registry }}/{{ .Values.charts.nginxS3Gateway.repository }}"
releases:
# Univention Management Stack Umbrella Chart
@@ -47,7 +47,7 @@ releases:
{{- range .Values.customization.release.ums }}
- {{ . }}
{{- end }}
installed: {{ .Values.nubus.enabled }}
installed: {{ .Values.apps.nubus.enabled }}
timeout: 900
# Intercom-Service
- name: "intercom-service"
@@ -58,7 +58,7 @@ releases:
{{- range .Values.customization.release.intercomService }}
- {{ . }}
{{- end }}
installed: {{ .Values.nubus.enabled }}
installed: {{ .Values.apps.nubus.enabled }}
# openDesk Keycloak Bootstrap Chart
- name: "opendesk-keycloak-bootstrap"
@@ -71,7 +71,7 @@ releases:
{{- end }}
needs:
- "ums"
installed: {{ .Values.nubus.enabled }}
installed: {{ .Values.apps.nubus.enabled }}
timeout: 900
# NGINX S3 Gateway (when cluster minio is not used)
@@ -83,7 +83,7 @@ releases:
{{- range .Values.customization.release.nginxS3Gateway }}
- {{ . }}
{{- end }}
installed: {{ not .Values.minio.enabled }}
installed: {{ not .Values.apps.minio.enabled }}
timeout: 900
commonLabels:

8
helmfile/apps/nubus/values-nubus.yaml.gotmpl
View File

@@ -119,7 +119,7 @@ global:
ingress:
# temporary fix
{{- if not .Values.minio.enabled }}
{{- if not .Values.apps.minio.enabled }}
enabled: false
{{- end }}
certManager:
@@ -524,7 +524,7 @@ nubusKeycloakExtensions:
password: "umcKeycloakExtensionsDatabasePassword"
smtp:
connection:
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
host: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
port: 25
ssl: false
starttls: false
@@ -1095,7 +1095,7 @@ nubusStackDataUms:
umcMemcachedUsername: ""
externalMailDomain: {{ .Values.global.mailDomain | default .Values.global.domain }}
umcHtmlTitle: "Portal - {{ .Values.theme.texts.productName }}"
smtpHost: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
smtpHost: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
smtpPort: 25
smtpUser: ""
smtpStartTls: false
@@ -1118,7 +1118,7 @@ nubusStackDataUms:
portalTitleEN: "Portal - {{ .Values.theme.texts.productName }}"
oxDefaultContext: "1"
componentEnabled:
notes: {{ .Values.notes.enabled }}
notes: {{ .Values.apps.notes.enabled }}
ldapSearchUsers:
{{- range $username, $password := .Values.secrets.nubus.ldapSearch }}
- username: {{ printf "ldapsearch_%s" $username | quote }}

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

@@ -57,7 +57,7 @@ config:
scope: "opendesk-dovecot-scope"
role: "opendesk-dovecot-access-control"
group: "managed-by-attribute-Groupware"
{{- if .Values.notes.enabled }}
{{- if .Values.apps.notes.enabled }}
notes:
client: "opendesk-notes"
scope: "opendesk-notes-scope"
@@ -66,7 +66,7 @@ config:
{{- end }}
componentEnabled:
notes: {{ .Values.notes.enabled }}
notes: {{ .Values.apps.notes.enabled }}
custom:
clientScopes:
{{ .Values.functional.authentication.oidc.clientScopes | toYaml | nindent 6 }}
@@ -431,7 +431,7 @@ config:
access.token.claim: true
claim.name: "opendesk_username"
jsonType.label: "String"
{{ if .Values.notes.enabled }}
{{ if .Values.apps.notes.enabled }}
- name: "opendesk-notes-scope"
description: "Scope for the claims required by openDesk's Notes instance."
protocol: "openid-connect"
@@ -522,7 +522,7 @@ config:
jsonType.label: "String"
defaultClientScopes:
- "offline_access"
{{ if .Values.notes.enabled }}
{{ if .Values.apps.notes.enabled }}
- name: "opendesk-notes"
clientId: "opendesk-notes"
protocol: "openid-connect"

26
helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl
View File

@@ -10,16 +10,26 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.dovecot.registry }}/{{ .Values.charts.dovecot.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.dovecot.registry }}/{{ .Values.charts.dovecot.repository }}"
# Open-Xchange
{{- if (env "OPENDESK_ENTERPRISE") }}
- name: "open-xchange-repo"
keyring: "../../files/gpg-pubkeys/open-xchange-com.gpg"
verify: {{ .Values.charts.oxAppSuite.verify }}
username: {{ env "ENTERPRISE_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "ENTERPRISE_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDeEnterprise .Values.global.helmRegistry | default .Values.charts.oxAppSuite.registry }}/{{ .Values.charts.oxAppSuite.repository }}"
{{- else }}
- name: "open-xchange-repo"
keyring: "../../files/gpg-pubkeys/open-xchange-com.gpg"
verify: {{ .Values.charts.oxAppSuite.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.oxAppSuite.registry }}/{{ .Values.charts.oxAppSuite.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.oxAppSuite.registry }}/{{ .Values.charts.oxAppSuite.repository }}"
{{- end }}
# openDesk Open-Xchange Bootstrap
# Source:
@@ -30,14 +40,14 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.oxAppSuiteBootstrap.registry }}/{{ .Values.charts.oxAppSuiteBootstrap.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.oxAppSuiteBootstrap.registry }}/{{ .Values.charts.oxAppSuiteBootstrap.repository }}"
# OX Connector
- name: "ox-connector-repo"
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.oxConnector.registry }}/{{ .Values.charts.oxConnector.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.oxConnector.registry }}/{{ .Values.charts.oxConnector.repository }}"
releases:
- name: "dovecot"
@@ -48,7 +58,7 @@ releases:
{{- range .Values.customization.release.dovecot }}
- {{ . }}
{{- end }}
installed: {{ .Values.dovecot.enabled }}
installed: {{ .Values.apps.dovecot.enabled }}
timeout: 900
- name: "open-xchange"
@@ -63,7 +73,7 @@ releases:
{{- range .Values.customization.release.openxchange }}
- {{ . }}
{{- end }}
installed: {{ .Values.oxAppSuite.enabled }}
installed: {{ .Values.apps.oxAppSuite.enabled }}
timeout: 900
- name: "opendesk-open-xchange-bootstrap"
@@ -74,7 +84,7 @@ releases:
{{- range .Values.customization.release.opendeskOpenxchangeBootstrap }}
- {{ . }}
{{- end }}
installed: {{ .Values.oxAppSuite.enabled }}
installed: {{ .Values.apps.oxAppSuite.enabled }}
timeout: 900
- name: "ox-connector"
@@ -85,7 +95,7 @@ releases:
{{- range .Values.customization.release.oxConnector }}
- {{ . }}
{{- end }}
installed: {{ .Values.oxAppSuite.enabled }}
installed: {{ .Values.apps.oxAppSuite.enabled }}
needs:
- "open-xchange"

2
helmfile/apps/open-xchange/values-dovecot.yaml.gotmpl
View File

@@ -38,7 +38,7 @@ dovecot:
submission:
enabled: true
ssl: "no"
host: "{{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain }}:25"
host: "{{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain }}:25"
certificate:
secretName: {{ .Values.ingress.tls.secretName | quote }}

4
helmfile/apps/open-xchange/values-openxchange.yaml.gotmpl
View File

@@ -340,9 +340,9 @@ appsuite:
com.openexchange.antivirus.server: {{ .Values.antivirus.icap.host | quote }}
com.openexchange.antivirus.port: {{ .Values.antivirus.icap.port | quote }}
{{- else }}
{{- if .Values.clamavDistributed.enabled }}
{{- if .Values.apps.clamavDistributed.enabled }}
com.openexchange.antivirus.server: "clamav-icap"
{{- else if .Values.clamavSimple.enabled }}
{{- else if .Values.apps.clamavSimple.enabled }}
com.openexchange.antivirus.server: "clamav-simple"
{{- end }}
com.openexchange.antivirus.port: "1344"

8
helmfile/apps/opendesk-migrations-post/helmfile-child.yaml.gotmpl
View File

@@ -4,17 +4,17 @@
repositories:
# openDesk Migrations
# Source:
- name: "openproject-migrations-repo"
- name: "opendesk-migrations-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.migrations.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.migrations.registry }}/{{ .Values.charts.migrations.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.migrations.registry }}/{{ .Values.charts.migrations.repository }}"
releases:
- name: "opendesk-migrations-post"
chart: "openproject-migrations-repo/{{ .Values.charts.migrations.name }}"
chart: "opendesk-migrations-repo/{{ .Values.charts.migrations.name }}"
version: "{{ .Values.charts.migrations.version }}"
wait: true
waitForJobs: true
@@ -24,7 +24,7 @@ releases:
{{- range .Values.customization.release.migrationsPost }}
- {{ . }}
{{- end }}
installed: {{ .Values.migrations.enabled }}
installed: {{ .Values.apps.migrations.enabled }}
timeout: 900
commonLabels:

4
helmfile/apps/opendesk-migrations-pre/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.migrations.registry }}/{{ .Values.charts.migrations.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.migrations.registry }}/{{ .Values.charts.migrations.repository }}"
releases:
- name: "opendesk-migrations-pre"
@@ -24,7 +24,7 @@ releases:
{{- range .Values.customization.release.migrationsPre }}
- {{ . }}
{{- end }}
installed: {{ .Values.migrations.enabled }}
installed: {{ .Values.apps.migrations.enabled }}
timeout: 900
commonLabels:

4
helmfile/apps/opendesk-openproject-bootstrap/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.openprojectBootstrap.registry }}/{{ .Values.charts.openprojectBootstrap.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.openprojectBootstrap.registry }}/{{ .Values.charts.openprojectBootstrap.repository }}"
releases:
- name: "opendesk-openproject-bootstrap"
@@ -23,7 +23,7 @@ releases:
{{- range .Values.customization.release.opendeskOpenprojectBootstrap }}
- {{ . }}
{{- end }}
installed: {{ .Values.openproject.enabled }}
installed: {{ .Values.apps.openproject.enabled }}
timeout: 900
commonLabels:

18
helmfile/apps/opendesk-services/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.otterize.registry }}/{{ .Values.charts.otterize.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.otterize.registry }}/{{ .Values.charts.otterize.repository }}"
# openDesk Home
# Source: https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-home
@@ -20,7 +20,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.home.registry }}/{{ .Values.charts.home.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.home.registry }}/{{ .Values.charts.home.repository }}"
# openDesk Certificates
# Source: https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-certificates
@@ -30,7 +30,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.certificates.registry }}/{{ .Values.charts.certificates.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.certificates.registry }}/{{ .Values.charts.certificates.repository }}"
# openDesk Alerts
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-alerts
@@ -40,7 +40,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskAlerts.registry }}/{{ .Values.charts.opendeskAlerts.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.opendeskAlerts.registry }}/{{ .Values.charts.opendeskAlerts.repository }}"
# openDesk Grafana Dashboards
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-dashboards
@@ -50,7 +50,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskDashboards.registry }}/{{ .Values.charts.opendeskDashboards.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.opendeskDashboards.registry }}/{{ .Values.charts.opendeskDashboards.repository }}"
# openDesk Static Files
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-static-files
@@ -60,7 +60,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.opendeskStaticFiles.registry }}/{{ .Values.charts.opendeskStaticFiles.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.opendeskStaticFiles.registry }}/{{ .Values.charts.opendeskStaticFiles.repository }}"
releases:
- name: "opendesk-otterize"
@@ -82,7 +82,7 @@ releases:
{{- range .Values.customization.release.opendeskHome }}
- {{ . }}
{{- end }}
installed: {{ .Values.home.enabled }}
installed: {{ .Values.apps.home.enabled }}
- name: "opendesk-certificates"
chart: "certificates-repo/{{ .Values.charts.certificates.name }}"
@@ -92,7 +92,7 @@ releases:
{{- range .Values.customization.release.opendeskCertificates }}
- {{ . }}
{{- end }}
installed: {{ .Values.certificates.enabled }}
installed: {{ .Values.apps.certificates.enabled }}
timeout: 900
- name: "opendesk-alerts"
@@ -125,7 +125,7 @@ releases:
{{- range .Values.customization.release.opendeskStaticFiles }}
- {{ . }}
{{- end }}
installed: {{ .Values.staticFiles.enabled }}
installed: {{ .Values.apps.staticFiles.enabled }}
timeout: 900
commonLabels:

22
helmfile/apps/opendesk-services/values-certificates.yaml.gotmpl
View File

@@ -7,13 +7,13 @@ SPDX-License-Identifier: Apache-2.0
global:
domain: {{ .Values.global.domain | quote }}
hosts:
{{- if .Values.collabora.enabled }}
{{- if .Values.apps.collabora.enabled }}
collabora: {{ .Values.global.hosts.collabora }}
{{- end }}
{{- if .Values.cryptpad.enabled }}
{{- if .Values.apps.cryptpad.enabled }}
cryptpad: {{ .Values.global.hosts.cryptpad }}
{{- end }}
{{- if .Values.element.enabled }}
{{- if .Values.apps.element.enabled }}
element: {{ .Values.global.hosts.element }}
matrixNeoBoardWidget: {{ .Values.global.hosts.matrixNeoBoardWidget }}
matrixNeoChoiceWidget: {{ .Values.global.hosts.matrixNeoChoiceWidget }}
@@ -23,30 +23,30 @@ global:
synapseFederation: {{ .Values.global.hosts.synapseFederation }}
whiteboard: {{ .Values.global.hosts.whiteboard }}
{{- end }}
{{- if .Values.nubus.enabled }}
{{- if .Values.apps.nubus.enabled }}
intercomService: {{ .Values.global.hosts.intercomService }}
{{- end }}
{{- if .Values.jitsi.enabled }}
{{- if .Values.apps.jitsi.enabled }}
jitsi: {{ .Values.global.hosts.jitsi }}
{{- end }}
{{- if .Values.minio.enabled }}
{{- if .Values.apps.minio.enabled }}
minioApi: {{ .Values.global.hosts.minioApi }}
minioConsole: {{ .Values.global.hosts.minioConsole }}
{{- end }}
{{- if .Values.nextcloud.enabled }}
{{- if .Values.apps.nextcloud.enabled }}
nextcloud: {{ .Values.global.hosts.nextcloud }}
{{- end }}
{{- if .Values.openproject.enabled }}
{{- if .Values.apps.openproject.enabled }}
openproject: {{ .Values.global.hosts.openproject }}
{{- end }}
{{- if .Values.oxAppSuite.enabled }}
{{- if .Values.apps.oxAppSuite.enabled }}
openxchange: {{ .Values.global.hosts.openxchange }}
{{- end }}
{{- if .Values.nubus.enabled }}
{{- if .Values.apps.nubus.enabled }}
keycloak: {{ .Values.global.hosts.keycloak }}
nubus: {{ .Values.global.hosts.nubus }}
{{- end }}
{{- if .Values.xwiki.enabled }}
{{- if .Values.apps.xwiki.enabled }}
xwiki: {{ .Values.global.hosts.xwiki }}
{{- end }}

40
helmfile/apps/opendesk-services/values-opendesk-alerts.yaml.gotmpl
View File

@@ -10,43 +10,43 @@ additionalLabels:
config:
collabora:
enable: {{ .Values.collabora.enabled }}
enable: {{ .Values.apps.collabora.enabled }}
selectors:
namespace: {{ .Values.collabora.namespace | quote }}
namespace: {{ .Values.apps.collabora.namespace | quote }}
matrix:
enable: {{ .Values.element.enabled }}
enable: {{ .Values.apps.element.enabled }}
selectors:
namespace: {{ .Values.element.namespace | quote }}
namespace: {{ .Values.apps.element.namespace | quote }}
diagrams:
enable: {{ .Values.cryptpad.enabled }}
enable: {{ .Values.apps.cryptpad.enabled }}
selectors:
namespace: {{ .Values.cryptpad.namespace | quote }}
namespace: {{ .Values.apps.cryptpad.namespace | quote }}
nextcloud:
enable: {{ .Values.nextcloud.enabled }}
enable: {{ .Values.apps.nextcloud.enabled }}
selectors:
namespace: {{ .Values.nextcloud.namespace | quote }}
namespace: {{ .Values.apps.nextcloud.namespace | quote }}
openXChange:
enable: {{ .Values.oxAppSuite.enabled }}
enable: {{ .Values.apps.oxAppSuite.enabled }}
selectors:
namespace: {{ .Values.oxAppSuite.namespace | quote }}
namespace: {{ .Values.apps.oxAppSuite.namespace | quote }}
xwiki:
enable: {{ .Values.xwiki.enabled }}
enable: {{ .Values.apps.xwiki.enabled }}
selectors:
namespace: {{ .Values.xwiki.namespace | quote }}
namespace: {{ .Values.apps.xwiki.namespace | quote }}
nubus:
enable: {{ .Values.nubus.enabled }}
enable: {{ .Values.apps.nubus.enabled }}
selectors:
namespace: {{ .Values.nubus.namespace | quote }}
namespace: {{ .Values.apps.nubus.namespace | quote }}
openProject:
enable: {{ .Values.openproject.enabled }}
enable: {{ .Values.apps.openproject.enabled }}
selectors:
namespace: {{ .Values.openproject.namespace | quote }}
namespace: {{ .Values.apps.openproject.namespace | quote }}
jitsi:
enable: {{ .Values.jitsi.enabled }}
enable: {{ .Values.apps.jitsi.enabled }}
selectors:
namespace: {{ .Values.jitsi.namespace | quote }}
namespace: {{ .Values.apps.jitsi.namespace | quote }}
collabora:
enable: {{ .Values.collabora.enabled }}
enable: {{ .Values.apps.collabora.enabled }}
selectors:
namespace: {{ .Values.collabora.namespace | quote }}
namespace: {{ .Values.apps.collabora.namespace | quote }}

40
helmfile/apps/opendesk-services/values-opendesk-dashboards.yaml.gotmpl
View File

@@ -12,43 +12,43 @@ additionalLabels:
config:
apps:
collabora:
enable: {{ .Values.collabora.enabled }}
enable: {{ .Values.apps.collabora.enabled }}
selectors:
namespace: {{ .Values.collabora.namespace | quote }}
namespace: {{ .Values.apps.collabora.namespace | quote }}
matrixElement:
enable: {{ .Values.element.enabled }}
enable: {{ .Values.apps.element.enabled }}
selectors:
namespace: {{ .Values.element.namespace | quote }}
namespace: {{ .Values.apps.element.namespace | quote }}
diagrams:
enable: {{ .Values.cryptpad.enabled }}
enable: {{ .Values.apps.cryptpad.enabled }}
selectors:
namespace: {{ .Values.cryptpad.namespace | quote }}
namespace: {{ .Values.apps.cryptpad.namespace | quote }}
nextcloud:
enable: {{ .Values.nextcloud.enabled }}
enable: {{ .Values.apps.nextcloud.enabled }}
selectors:
namespace: {{ .Values.nextcloud.namespace | quote }}
namespace: {{ .Values.apps.nextcloud.namespace | quote }}
openxchange:
enable: {{ .Values.oxAppSuite.enabled }}
enable: {{ .Values.apps.oxAppSuite.enabled }}
selectors:
namespace: {{ .Values.oxAppSuite.namespace | quote }}
namespace: {{ .Values.apps.oxAppSuite.namespace | quote }}
xwiki:
enable: {{ .Values.xwiki.enabled }}
enable: {{ .Values.apps.xwiki.enabled }}
selectors:
namespace: {{ .Values.xwiki.namespace | quote }}
namespace: {{ .Values.apps.xwiki.namespace | quote }}
nubus:
enable: {{ .Values.nubus.enabled }}
enable: {{ .Values.apps.nubus.enabled }}
selectors:
namespace: {{ .Values.nubus.namespace | quote }}
namespace: {{ .Values.apps.nubus.namespace | quote }}
openproject:
enable: {{ .Values.openproject.enabled }}
enable: {{ .Values.apps.openproject.enabled }}
selectors:
namespace: {{ .Values.openproject.namespace | quote }}
namespace: {{ .Values.apps.openproject.namespace | quote }}
jitsi:
enable: {{ .Values.jitsi.enabled }}
enable: {{ .Values.apps.jitsi.enabled }}
selectors:
namespace: {{ .Values.jitsi.namespace | quote }}
namespace: {{ .Values.apps.jitsi.namespace | quote }}
collabora:
enable: {{ .Values.collabora.enabled }}
enable: {{ .Values.apps.collabora.enabled }}
selectors:
namespace: {{ .Values.collabora.namespace | quote }}
namespace: {{ .Values.apps.collabora.namespace | quote }}
...

42
helmfile/apps/opendesk-services/values-otterize.yaml.gotmpl
View File

@@ -10,47 +10,47 @@ global:
apps:
clamavDistributed:
enabled: {{ .Values.clamavDistributed.enabled }}
enabled: {{ .Values.apps.clamavDistributed.enabled }}
clamavSimple:
enabled: {{ .Values.clamavSimple.enabled }}
enabled: {{ .Values.apps.clamavSimple.enabled }}
collabora:
enabled: {{ .Values.collabora.enabled }}
enabled: {{ .Values.apps.collabora.enabled }}
cryptpad:
enabled: {{ .Values.cryptpad.enabled }}
enabled: {{ .Values.apps.cryptpad.enabled }}
dkimpy:
enabled: {{ .Values.dkimpy.enabled }}
enabled: {{ .Values.apps.dkimpy.enabled }}
dovecot:
enabled: {{ .Values.dovecot.enabled }}
enabled: {{ .Values.apps.dovecot.enabled }}
element:
enabled: {{ .Values.element.enabled }}
enabled: {{ .Values.apps.element.enabled }}
jitsi:
enabled: {{ .Values.jitsi.enabled }}
enabled: {{ .Values.apps.jitsi.enabled }}
mariadb:
enabled: {{ .Values.mariadb.enabled }}
enabled: {{ .Values.apps.mariadb.enabled }}
memcached:
enabled: {{ .Values.memcached.enabled }}
enabled: {{ .Values.apps.memcached.enabled }}
migrations:
enabled: {{ .Values.migrations.enabled }}
enabled: {{ .Values.apps.migrations.enabled }}
minio:
enabled: {{ .Values.minio.enabled }}
enabled: {{ .Values.apps.minio.enabled }}
nextcloud:
enabled: {{ .Values.nextcloud.enabled }}
enabled: {{ .Values.apps.nextcloud.enabled }}
notes:
enabled: {{ .Values.notes.enabled }}
enabled: {{ .Values.apps.notes.enabled }}
nubus:
enabled: {{ .Values.nubus.enabled }}
enabled: {{ .Values.apps.nubus.enabled }}
openproject:
enabled: {{ .Values.openproject.enabled }}
enabled: {{ .Values.apps.openproject.enabled }}
oxAppsuite:
enabled: {{ .Values.oxAppSuite.enabled }}
enabled: {{ .Values.apps.oxAppSuite.enabled }}
postfix:
enabled: {{ .Values.postfix.enabled }}
enabled: {{ .Values.apps.postfix.enabled }}
postgresql:
enabled: {{ .Values.postgresql.enabled }}
enabled: {{ .Values.apps.postgresql.enabled }}
redis:
enabled: {{ .Values.redis.enabled }}
enabled: {{ .Values.apps.redis.enabled }}
xwiki:
enabled: {{ .Values.xwiki.enabled }}
enabled: {{ .Values.apps.xwiki.enabled }}
ingressController:
{{ .Values.security.ingressController | toYaml | nindent 2 }}

4
helmfile/apps/openproject/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.openproject.registry }}/{{ .Values.charts.openproject.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.openproject.registry }}/{{ .Values.charts.openproject.repository }}"
releases:
- name: "openproject"
@@ -23,7 +23,7 @@ releases:
{{- range .Values.customization.release.openproject }}
- {{ . }}
{{- end }}
installed: {{ .Values.openproject.enabled }}
installed: {{ .Values.apps.openproject.enabled }}
timeout: 1800
commonLabels:

2
helmfile/apps/openproject/values.yaml.gotmpl
View File

@@ -80,7 +80,7 @@ environment:
OPENPROJECT_SMTP__PASSWORD: ""
OPENPROJECT_SMTP__PORT: 25
OPENPROJECT_SMTP__SSL: "false" # (default=false)
OPENPROJECT_SMTP__ADDRESS: {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
OPENPROJECT_SMTP__ADDRESS: {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
OPENPROJECT_SMTP__AUTHENTICATION: "none"
OPENPROJECT_SMTP__ENABLE__STARTTLS__AUTO: "false"
OPENPROJECT_SMTP__OPENSSL__VERIFY__MODE: "none"

40
helmfile/apps/services-external/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.postgresql.registry }}/{{ .Values.charts.postgresql.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.postgresql.registry }}/{{ .Values.charts.postgresql.repository }}"
# openDesk MariaDB
# Source: https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-mariadb
@@ -20,7 +20,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.mariadb.registry }}/{{ .Values.charts.mariadb.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.mariadb.registry }}/{{ .Values.charts.mariadb.repository }}"
# openDesk dkimpy-milter
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-dkimpy-milter
@@ -30,7 +30,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.dkimpy.registry }}/{{ .Values.charts.dkimpy.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.dkimpy.registry }}/{{ .Values.charts.dkimpy.repository }}"
# openDesk Postfix
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-postfix
@@ -40,7 +40,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.postfix.registry }}/{{ .Values.charts.postfix.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.postfix.registry }}/{{ .Values.charts.postfix.repository }}"
# openDesk ClamAV
# https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-clamav
@@ -50,14 +50,14 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.clamav.registry }}/{{ .Values.charts.clamav.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.clamav.registry }}/{{ .Values.charts.clamav.repository }}"
- name: "clamav-simple-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.clamavSimple.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.clamavSimple.registry }}/{{ .Values.charts.clamavSimple.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.clamavSimple.registry }}/{{ .Values.charts.clamavSimple.repository }}"
# VMWare Bitnami
# Source: https://github.com/bitnami/charts/
@@ -67,21 +67,21 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.memcached.registry }}/{{ .Values.charts.memcached.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.memcached.registry }}/{{ .Values.charts.memcached.repository }}"
- name: "redis-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.redis.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.redis.registry }}/{{ .Values.charts.redis.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.redis.registry }}/{{ .Values.charts.redis.repository }}"
- name: "minio-repo"
keyring: "../../files/gpg-pubkeys/opencode.gpg"
verify: {{ .Values.charts.minio.verify }}
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.minio.registry }}/{{ .Values.charts.minio.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.minio.registry }}/{{ .Values.charts.minio.repository }}"
# openDesk Enterprise
# Cassandra
@@ -92,7 +92,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.cassandra.registry }}/{{ .Values.charts.cassandra.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.cassandra.registry }}/{{ .Values.charts.cassandra.repository }}"
releases:
- name: "redis"
@@ -103,7 +103,7 @@ releases:
{{- range .Values.customization.release.redis }}
- {{ . }}
{{- end }}
installed: {{ .Values.redis.enabled }}
installed: {{ .Values.apps.redis.enabled }}
timeout: 900
- name: "memcached"
@@ -114,7 +114,7 @@ releases:
{{- range .Values.customization.release.memcached }}
- {{ . }}
{{- end }}
installed: {{ .Values.memcached.enabled }}
installed: {{ .Values.apps.memcached.enabled }}
timeout: 900
- name: "postgresql"
@@ -125,7 +125,7 @@ releases:
{{- range .Values.customization.release.postgresql }}
- {{ . }}
{{- end }}
installed: {{ .Values.postgresql.enabled }}
installed: {{ .Values.apps.postgresql.enabled }}
timeout: 900
- name: "mariadb"
@@ -136,7 +136,7 @@ releases:
{{- range .Values.customization.release.mariadb }}
- {{ . }}
{{- end }}
installed: {{ .Values.mariadb.enabled }}
installed: {{ .Values.apps.mariadb.enabled }}
timeout: 900
- name: "postfix"
@@ -147,7 +147,7 @@ releases:
{{- range .Values.customization.release.postfix }}
- {{ . }}
{{- end }}
installed: {{ .Values.postfix.enabled }}
installed: {{ .Values.apps.postfix.enabled }}
timeout: 900
- name: "opendesk-dkimpy-milter"
@@ -158,7 +158,7 @@ releases:
{{- range .Values.customization.release.opendeskDkimpyMilter }}
- {{ . }}
{{- end }}
installed: {{ .Values.dkimpy.enabled }}
installed: {{ .Values.apps.dkimpy.enabled }}
timeout: 900
- name: "clamav"
@@ -169,7 +169,7 @@ releases:
{{- range .Values.customization.release.clamav }}
- {{ . }}
{{- end }}
installed: {{ .Values.clamavDistributed.enabled }}
installed: {{ .Values.apps.clamavDistributed.enabled }}
timeout: 900
- name: "clamav-simple"
@@ -180,7 +180,7 @@ releases:
{{- range .Values.customization.release.clamavSimple }}
- {{ . }}
{{- end }}
installed: {{ .Values.clamavSimple.enabled }}
installed: {{ .Values.apps.clamavSimple.enabled }}
timeout: 900
- name: "minio"
@@ -191,7 +191,7 @@ releases:
{{- range .Values.customization.release.minio }}
- {{ . }}
{{- end }}
installed: {{ .Values.minio.enabled }}
installed: {{ .Values.apps.minio.enabled }}
timeout: 900
# openDesk Enterprise Releases
@@ -203,7 +203,7 @@ releases:
{{- range .Values.customization.release.cassandra }}
- {{ . }}
{{- end }}
installed: {{ .Values.cassandra.enabled }}
installed: {{ .Values.apps.cassandra.enabled }}
timeout: 900
commonLabels:

6
helmfile/apps/services-external/values-postfix.yaml.gotmpl
View File

@@ -52,7 +52,7 @@ postfix:
- fileName: "sasl_passwd.map"
content:
- {{ printf "%s %s:%s" .Values.smtp.host .Values.smtp.username .Values.smtp.password | quote }}
{{- if .Values.dkimpy.enabled }}
{{- if .Values.apps.dkimpy.enabled }}
dkimpyHost: "opendesk-dkimpy-milter.{{ .Release.Namespace }}.svc.{{.Values.cluster.networking.domain }}:8892"
{{- end }}
rspamdHost: ""
@@ -71,9 +71,9 @@ postfix:
{{- if .Values.antivirus.milter.host }}
smtpdMilters: "inet:{{ .Values.antivirus.milter.host }}:{{ .Values.antivirus.milter.port }}"
{{- else }}
{{- if .Values.clamavDistributed.enabled }}
{{- if .Values.apps.clamavDistributed.enabled }}
smtpdMilters: "inet:clamav-milter:7357"
{{- else if .Values.clamavSimple.enabled }}
{{- else if .Values.apps.clamavSimple.enabled }}
smtpdMilters: "inet:clamav-simple:7357"
{{- end }}
{{- end }}

4
helmfile/apps/xwiki/helmfile-child.yaml.gotmpl
View File

@@ -10,7 +10,7 @@ repositories:
username: {{ env "OD_PRIVATE_REGISTRY_USERNAME" | quote }}
password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }}
oci: true
url: "{{ .Values.global.helmRegistry | default .Values.charts.xwiki.registry }}/{{ .Values.charts.xwiki.repository }}"
url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.xwiki.registry }}/{{ .Values.charts.xwiki.repository }}"
releases:
- name: "xwiki"
@@ -22,7 +22,7 @@ releases:
{{- range .Values.customization.release.xwiki }}
- {{ . }}
{{- end }}
installed: {{ .Values.xwiki.enabled }}
installed: {{ .Values.apps.xwiki.enabled }}
timeout: 1800
commonLabels:

4
helmfile/apps/xwiki/values.yaml.gotmpl
View File

@@ -18,7 +18,7 @@ image:
imagePullSecrets: {{ .Values.global.imagePullSecrets }}
javaOpts:
{{- if and (env "OPENDESK_ENTERPRISE") .Values.enterprise.xwiki.opendeskEnterpriseLicense .Values.enterprise.xwiki.proApplicationslicense }}
{{- if and (env "OPENDESK_ENTERPRISE") .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense .Values.enterpriseKeys.xwiki.proApplicationslicense }}
- "-Dlicenses={{ .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense }},{{ .Values.enterpriseKeys.xwiki.proApplicationslicense }}"
{{- end }}
{{- if .Values.certificate.selfSigned }}
@@ -165,7 +165,7 @@ properties:
"property:xwiki:XWiki.XWikiPreferences^XWiki.XWikiPreferences.ldap_group_mapping": "xwiki:XWiki.XWikiAdminGroup=cn=managed-by-attribute-KnowledgemanagementAdmin,cn=groups,dc=swp-ldap,dc=internal"
## SMTP settings
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.from": "{{ .Values.smtp.localpartNoReply }}@{{ .Values.global.domain }}"
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.host": {{ printf "%s.%s.svc.%s" "postfix" (.Values.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.host": {{ printf "%s.%s.svc.%s" "postfix" (.Values.apps.postfix.namespace | default .Release.Namespace) .Values.cluster.networking.domain | quote }}
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.port": 25
"property:xwiki:Mail.MailConfig^Mail.SendMailConfigClass.properties": "mail.smtp.starttls.enable=false"
## Link LDAP users and users authenticated through OIDC

2
helmfile/environments/default/images.yaml.gotmpl
View File

@@ -294,7 +294,7 @@ images:
# upstreamRepository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
registry: "registry.opencode.de"
repository: "bmi/opendesk/components/platform-development/images/opendesk-migrations"
tag: "1.4.0@sha256:0c74011e4c1216857b73695741196908afcacc2f531fd1c894b8f574ac98f9a2"
tag: "1.4.1@sha256:c831f3bb27da483cbf46239d8f96df9597f710fbe3804f198ee1d89b1be71936"
milter:
# providerCategory: "Community"
# providerResponsible: "openDesk"

169
helmfile/environments/default/opendesk_main.yaml.gotmpl
View File

@@ -4,88 +4,89 @@
#
# Note: Currently only single namespace deployments are supported.
---
cassandra:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
certificates:
enabled: true
namespace: ~
clamavDistributed:
enabled: false
namespace: ~
clamavSimple:
enabled: true
namespace: ~
collabora:
enabled: true
namespace: ~
collaboraController:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
cryptpad:
enabled: true
namespace: ~
dkimpy:
enabled: false
namespace: ~
dovecot:
enabled: true
namespace: ~
element:
enabled: true
namespace: ~
elementAdmin:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
elementGroupsync:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
home:
enabled: true
namespace: ~
jitsi:
enabled: true
namespace: ~
mariadb:
enabled: true
namespace: ~
memcached:
enabled: true
namespace: ~
migrations:
enabled: true
namespace: ~
minio:
enabled: true
namespace: ~
nextcloud:
enabled: true
namespace: ~
notes:
enabled: false
namespace: ~
nubus:
enabled: true
namespace: ~
openproject:
enabled: true
namespace: ~
oxAppSuite:
enabled: true
namespace: ~
postfix:
enabled: true
namespace: ~
postgresql:
enabled: true
namespace: ~
redis:
enabled: true
namespace: ~
staticFiles:
enabled: true
namespace: ~
xwiki:
enabled: true
namespace: ~
apps:
cassandra:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
certificates:
enabled: true
namespace: ~
clamavDistributed:
enabled: false
namespace: ~
clamavSimple:
enabled: true
namespace: ~
collabora:
enabled: true
namespace: ~
collaboraController:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
cryptpad:
enabled: true
namespace: ~
dkimpy:
enabled: false
namespace: ~
dovecot:
enabled: true
namespace: ~
element:
enabled: true
namespace: ~
elementAdmin:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
elementGroupsync:
enabled: {{ if eq (env "OPENDESK_ENTERPRISE") "true" }}true{{ else }}false{{ end }}
namespace: ~
home:
enabled: true
namespace: ~
jitsi:
enabled: true
namespace: ~
mariadb:
enabled: true
namespace: ~
memcached:
enabled: true
namespace: ~
migrations:
enabled: true
namespace: ~
minio:
enabled: true
namespace: ~
nextcloud:
enabled: true
namespace: ~
notes:
enabled: false
namespace: ~
nubus:
enabled: true
namespace: ~
openproject:
enabled: true
namespace: ~
oxAppSuite:
enabled: true
namespace: ~
postfix:
enabled: true
namespace: ~
postgresql:
enabled: true
namespace: ~
redis:
enabled: true
namespace: ~
staticFiles:
enabled: true
namespace: ~
xwiki:
enabled: true
namespace: ~
...

2
helmfile/shared/migrations.yaml.gotmpl
View File

@@ -20,7 +20,7 @@ cleanup:
migrations:
runId: 3
namespace: {{ .Values.migrations.namespace | default .Release.Namespace | quote }}
namespace: {{ .Values.apps.migrations.namespace | default .Release.Namespace | quote }}
loglevel: {{ if .Values.debug.enabled }}"DEBUG"{{ else }}"INFO"{{ end }}
failOnUnexpectedState: true
environmentDetails: