From dfaf4be640209f5908815cceaf29db591212ddaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Ro=C3=9Fner?= Date: Tue, 9 Jul 2024 11:11:43 +0200 Subject: [PATCH] fix(openproject): Support for adding token to enable OpenProject Premium. --- helmfile/apps/openproject/values.yaml.gotmpl | 3 +++ helmfile/environments/default/charts.yaml | 2 +- helmfile/environments/default/enterprise.yaml | 9 +++++++++ helmfile/environments/default/functional.yaml | 2 ++ 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 helmfile/environments/default/enterprise.yaml diff --git a/helmfile/apps/openproject/values.yaml.gotmpl b/helmfile/apps/openproject/values.yaml.gotmpl index 7f3774a2..4f97b41b 100644 --- a/helmfile/apps/openproject/values.yaml.gotmpl +++ b/helmfile/apps/openproject/values.yaml.gotmpl @@ -71,6 +71,9 @@ environment: OPENPROJECT_HOME__URL: {{ printf "https://%s.%s/" .Values.global.hosts.univentionManagementStack .Values.global.domain | quote }} OPENPROJECT_OPENID__CONNECT_KEYCLOAK_ISSUER: "https://{{ .Values.global.hosts.keycloak }}.{{ .Values.global.domain }}/realms/{{ .Values.platform.realm }}" OPENPROJECT_OPENID__CONNECT_KEYCLOAK_POST__LOGOUT__REDIRECT__URI: "https://{{ .Values.global.hosts.openproject }}.{{ .Values.global.domain }}/" + {{- if .Values.enterprise.openproject.token }} + OPENPROJECT_ENTERPRISE__TOKEN: {{ .Values.enterprise.openproject.token | quote }} + {{- end }} image: registry: {{ .Values.global.imageRegistry | default .Values.images.openproject.registry | quote }} diff --git a/helmfile/environments/default/charts.yaml b/helmfile/environments/default/charts.yaml index 3e484fb1..46480869 100644 --- a/helmfile/environments/default/charts.yaml +++ b/helmfile/environments/default/charts.yaml @@ -252,7 +252,7 @@ charts: registry: "registry.opencode.de" repository: "bmi/opendesk/components/supplier/openproject/charts-mirror" name: "openproject" - version: "5.1.4" + version: "5.3.0" verify: true openprojectBootstrap: # providerCategory: "Platform" diff --git a/helmfile/environments/default/enterprise.yaml b/helmfile/environments/default/enterprise.yaml new file mode 100644 index 00000000..169d0dcb --- /dev/null +++ b/helmfile/environments/default/enterprise.yaml @@ -0,0 +1,9 @@ +# SPDX-FileCopyrightText: 2024 Zentrum für Digitale Souveränität der Öffentlichen Verwaltung (ZenDiS) GmbH +# SPDX-License-Identifier: Apache-2.0 +# The variables set in this file are required to upgrade components to their "Enterprise" product variant. +--- +enterprise: + openproject: + # Enterprise token must match the deployment's OpenProject host name. + token: "" +... diff --git a/helmfile/environments/default/functional.yaml b/helmfile/environments/default/functional.yaml index a1967a1c..dc71aa13 100644 --- a/helmfile/environments/default/functional.yaml +++ b/helmfile/environments/default/functional.yaml @@ -31,11 +31,13 @@ filestore: # Nextcloud specific configuration nextcloud: retentionObligation: + # yamllint disable rule:line-length # Set Nextcloud's `trashbin_retention_obligation` # Ref.: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#trashbin-retention-obligation trashbin: "auto" # Set Nextcloud's `versions_retention_obligation` # Ref.: https://docs.nextcloud.com/server/latest/admin_manual/configuration_server/config_sample_php_parameters.html#versions-retention-obligation versions: "auto" + # yamllint enable rule:line-length ...