From 00a1a9394ee3544b1a0d7b3e975c36830ba8b13c Mon Sep 17 00:00:00 2001 From: Thomas Kaltenbrunner Date: Wed, 4 Dec 2024 22:56:33 +0100 Subject: [PATCH] fix(element): Prepare element for openDesk Enterprise. --- .../apps/element/helmfile-child.yaml.gotmpl | 105 +++++++++++++++++- helmfile/environments/default/charts.yaml | 42 +++++-- .../environments/default/customization.yaml | 7 ++ .../environments/default/opendesk_main.gotmpl | 6 + 4 files changed, 152 insertions(+), 8 deletions(-) diff --git a/helmfile/apps/element/helmfile-child.yaml.gotmpl b/helmfile/apps/element/helmfile-child.yaml.gotmpl index ea4679ef..96c31790 100644 --- a/helmfile/apps/element/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/element/helmfile-child.yaml.gotmpl @@ -32,7 +32,6 @@ repositories: password: {{ env "OD_PRIVATE_REGISTRY_PASSWORD" | quote }} oci: true url: "{{ .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 }} @@ -79,6 +78,39 @@ repositories: oci: true url: "{{ .Values.global.helmRegistry | default .Values.charts.matrixNeodatefixBot.registry }}/{{ .Values.charts.matrixNeodatefixBot.repository }}" + # openDesk Enterprise Repositories + + # openDesk Element + # Source: https://gitlab.opencode.de/bmi/opendesk/components/platform-development/charts/opendesk-element + - name: "synapse-admin-repo" + keyring: "../../files/gpg-pubkeys/opencode.gpg" + verify: {{ .Values.charts.synapseAdmin.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.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 }}" + - 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 }}" + - 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 }}" + releases: # During upgrade 1.0.0 -> 1.1.0 the chart 'opendesk-element' has been moved to 'opendesk-element-web' - name: "opendesk-element" @@ -186,6 +218,77 @@ releases: installed: {{ .Values.element.enabled }} timeout: 900 + # openDesk Enterprise Releases + - name: "opendesk-synapse-admin" + chart: "synapse-admin-repo/{{ .Values.charts.synapseAdmin.name }}" + version: "{{ .Values.charts.synapseAdmin.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAdmin }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-adminbot-bootstrap" + chart: "synapse-create-account-repo/{{ .Values.charts.synapseCreateAccount.name }}" + version: "{{ .Values.charts.synapseCreateAccount.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAdminbotBootstrap }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-adminbot-pipe" + chart: "synapse-pipe-repo/{{ .Values.charts.synapsePipe.name }}" + version: "{{ .Values.charts.synapsePipe.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAdminbotPipe }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-adminbot-web" + chart: "synapse-adminbot-web-repo/{{ .Values.charts.synapseAdminbotWeb.name }}" + version: "{{ .Values.charts.synapseAdminbotWeb.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAdminbotWeb }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-auditbot-bootstrap" + chart: "synapse-create-account-repo/{{ .Values.charts.synapseCreateAccount.name }}" + version: "{{ .Values.charts.synapseCreateAccount.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAuditbotBootstrap }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-auditbot-pipe" + chart: "synapse-pipe-repo/{{ .Values.charts.synapsePipe.name }}" + version: "{{ .Values.charts.synapsePipe.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseAuditbotPipe }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementAdmin.enabled }} + timeout: 900 + + - name: "opendesk-synapse-groupsync" + chart: "synapse-groupsync-repo/{{ .Values.charts.synapseGroupsync.name }}" + version: "{{ .Values.charts.synapseGroupsync.version }}" + values: + {{ range .Values.customization.release.opendeskSynapseGroupsync }} + - {{ . }} + {{ end }} + installed: {{ .Values.elementGroupsync.enabled }} + timeout: 900 + commonLabels: deployStage: "050-components" component: "element" diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 89af9434..17ab89e4 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -97,7 +97,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-element" - version: "5.0.0" + version: "5.0.1" verify: true elementWeb: # providerCategory: "Platform" @@ -107,7 +107,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-element-web" - version: "5.0.0" + version: "5.0.1" verify: true elementWellKnown: # providerCategory: "Platform" @@ -117,7 +117,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-well-known" - version: "5.0.0" + version: "5.0.1" verify: true home: # providerCategory: "Platform" @@ -209,7 +209,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-matrix-user-verification-service" - version: "3.4.0" + version: "5.0.1" verify: true memcached: # providerCategory: "Community" @@ -427,7 +427,21 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse" - version: "5.0.0" + version: "5.0.1" + verify: true + synapseAdmin: + # Component is required for openDesk Enterprise only. + registry: "" + repository: "" + name: "" + version: "" + verify: true + synapseAdminbotWeb: + # Component is required for openDesk Enterprise only. + registry: "" + repository: "" + name: "" + version: "" verify: true synapseCreateAccount: # providerCategory: "Platform" @@ -437,7 +451,21 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse-create-account" - version: "5.0.0" + version: "5.0.1" + verify: true + synapseGroupsync: + # Component is required for openDesk Enterprise only. + registry: "" + repository: "" + name: "" + version: "" + verify: true + synapsePipe: + # Component is required for openDesk Enterprise only. + registry: "" + repository: "" + name: "" + version: "" verify: true synapseWeb: # providerCategory: "Platform" @@ -447,7 +475,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" name: "opendesk-synapse-web" - version: "5.0.0" + version: "5.0.1" verify: true xwiki: # providerCategory: "Supplier" diff --git a/helmfile/environments/default/customization.yaml b/helmfile/environments/default/customization.yaml index f4c51059..5cb825d3 100644 --- a/helmfile/environments/default/customization.yaml +++ b/helmfile/environments/default/customization.yaml @@ -68,4 +68,11 @@ customization: # openDesk Enterprise Components cassandra: {} + opendeskSynapseAdmin: {} + opendeskSynapseAdminbotBootstrap: {} + opendeskSynapseAdminbotPipe: {} + opendeskSynapseAdminbotWeb: {} + opendeskSynapseAuditbotBootstrap: {} + opendeskSynapseAuditbotPipe: {} + opendeskSynapseGroupsync: {} ... diff --git a/helmfile/environments/default/opendesk_main.gotmpl b/helmfile/environments/default/opendesk_main.gotmpl index 0c0e37b0..e5e9d19e 100644 --- a/helmfile/environments/default/opendesk_main.gotmpl +++ b/helmfile/environments/default/opendesk_main.gotmpl @@ -75,4 +75,10 @@ xwiki: cassandra: enabled: false namespace: ~ +elementAdmin: + enabled: false + namespace: ~ +elementGroupsync: + enabled: false + namespace: ~ ...