From acf0e41293654fa4c074bdb018c43f93a1d55b3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 28 Nov 2023 08:39:30 +0100 Subject: [PATCH 1/2] Allow mapping of OIDC attributes in helm charts --- charts/openproject/templates/secrets.yaml | 6 ++++-- charts/openproject/values.yaml | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/charts/openproject/templates/secrets.yaml b/charts/openproject/templates/secrets.yaml index be3e8c4..2c151b9 100644 --- a/charts/openproject/templates/secrets.yaml +++ b/charts/openproject/templates/secrets.yaml @@ -45,8 +45,10 @@ stringData: {{ $oidc_prefix }}_USERINFO__ENDPOINT: {{ .Values.openproject.oidc.userinfoEndpoint | quote }} {{ $oidc_prefix }}_END__SESSION__ENDPOINT: {{ .Values.openproject.oidc.endSessionEndpoint | quote }} {{ $oidc_prefix }}_SCOPE: {{ .Values.openproject.oidc.scope | quote }} - # Until https://community.openproject.org/wp/42390 is fixed (probably 12.5) we need the following setting - OPENPROJECT_SELF__REGISTRATION: "3" + {{- range $key, $value := .Values.openproject.oidc.attribute_map }} + {{ $mapping_key := printf "%s_ATTRIBUTE_MAP_%s" $oidc_prefix (upper $key) }} + {{ $mapping_key }}: {{ $value | quote }} + {{- end }} {{- end }} {{- if .Values.s3.enabled }} OPENPROJECT_ATTACHMENTS__STORAGE: fog diff --git a/charts/openproject/values.yaml b/charts/openproject/values.yaml index cd0659e..f697745 100644 --- a/charts/openproject/values.yaml +++ b/charts/openproject/values.yaml @@ -266,6 +266,8 @@ openproject: userinfoEndpoint: "" endSessionEndpoint: "" scope: "[openid]" + # Optional attribute mappings from the id token + attribute_map: {} ## Modify PostgreSQL statement timout. ## Increase in case you get errors such as "ERROR: canceling statement due to statement timeout". From 0d233ee9ccf5e9f9a77c848cecf515f040481681 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oliver=20G=C3=BCnther?= Date: Tue, 28 Nov 2023 08:39:42 +0100 Subject: [PATCH 2/2] Bump version to 2.7.0 --- charts/openproject/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/openproject/Chart.yaml b/charts/openproject/Chart.yaml index b89a4a6..21ce12c 100644 --- a/charts/openproject/Chart.yaml +++ b/charts/openproject/Chart.yaml @@ -6,7 +6,7 @@ home: "https://www.openproject.org/" icon: "https://www.openproject.org/assets/images/press/openproject-icon-original-color-41055eb6.png" type: "application" appVersion: "13" -version: "2.6.2" +version: "2.7.0" maintainers: - name: OpenProject url: https://github.com/opf/helm-charts