From cd9c54b17733f9e334c558ccd86e69677264970a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Fri, 31 Jan 2025 07:32:00 +0100 Subject: [PATCH] fix(helmfile): Remove reference to no longer required `elementWeb` chart --- helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl | 2 +- helmfile/apps/openproject/values.yaml.gotmpl | 2 +- helmfile/apps/xwiki/values.yaml.gotmpl | 2 +- helmfile/environments/default/charts.yaml.gotmpl | 10 ---------- 4 files changed, 3 insertions(+), 13 deletions(-) diff --git a/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl b/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl index a3136b13..5135e50f 100644 --- a/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl +++ b/helmfile/apps/open-xchange/helmfile-child.yaml.gotmpl @@ -13,7 +13,7 @@ repositories: url: "{{ coalesce .Values.repositories.helm.registryOpencodeDe .Values.global.helmRegistry | default .Values.charts.dovecot.registry }}/{{ .Values.charts.dovecot.repository }}" # Open-Xchange - {{- if (env "OPENDESK_ENTERPRISE") }} + {{- if eq (env "OPENDESK_ENTERPRISE") "true" }} - name: "open-xchange-repo" keyring: "../../files/gpg-pubkeys/open-xchange-com.gpg" verify: {{ .Values.charts.oxAppSuite.verify }} diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index 8efb8bc6..30453edf 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -38,7 +38,7 @@ dbInit: {{ .Values.resources.openprojectDbInit | toYaml | nindent 4 }} environment: - {{- if and (env "OPENDESK_ENTERPRISE") .Values.enterpriseKeys.openproject.token }} + {{- if and (eq (env "OPENDESK_ENTERPRISE") "true") .Values.enterpriseKeys.openproject.token }} OPENPROJECT_ENTERPRISE__TOKEN: {{ .Values.enterpriseKeys.openproject.token | quote }} {{- end }} # For more details and more options see diff --git a/helmfile/apps/xwiki/values.yaml.gotmpl b/helmfile/apps/xwiki/values.yaml.gotmpl index 3404557d..665fb075 100644 --- a/helmfile/apps/xwiki/values.yaml.gotmpl +++ b/helmfile/apps/xwiki/values.yaml.gotmpl @@ -18,7 +18,7 @@ image: imagePullSecrets: {{ .Values.global.imagePullSecrets }} javaOpts: - {{- if and (env "OPENDESK_ENTERPRISE") .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense .Values.enterpriseKeys.xwiki.proApplicationslicense }} + {{- if and (eq (env "OPENDESK_ENTERPRISE") "true") .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense .Values.enterpriseKeys.xwiki.proApplicationslicense }} - "-Dlicenses={{ .Values.enterpriseKeys.xwiki.opendeskEnterpriseLicense }},{{ .Values.enterpriseKeys.xwiki.proApplicationslicense }}" {{- end }} {{- if .Values.certificate.selfSigned }} diff --git a/helmfile/environments/default/charts.yaml.gotmpl b/helmfile/environments/default/charts.yaml.gotmpl index e82c7aaf..459ab385 100644 --- a/helmfile/environments/default/charts.yaml.gotmpl +++ b/helmfile/environments/default/charts.yaml.gotmpl @@ -111,16 +111,6 @@ charts: name: "opendesk-element" version: "6.0.2" verify: true - elementWeb: - # providerCategory: "Platform" - # providerResponsible: "openDesk" - # upstreamRegistry: "https://registry.opencode.de" - # upstreamRepository: "bmi/opendesk/components/platform-development/charts/opendesk-element/opendesk-element" - registry: "registry.opencode.de" - repository: "bmi/opendesk/components/platform-development/charts/opendesk-element" - name: "opendesk-element-web" - version: "6.0.2" - verify: true elementWellKnown: # providerCategory: "Platform" # providerResponsible: "openDesk"