Update OIDC scopes to use range in helm template (#473)

* matrix.oidc_config.scopes is now templated as a range for homeserver.yaml * fix templating errors
small-hack · Oct 29, 2023 · e582878 · e582878
1 parent 06861d6
commit e582878
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/charts/matrix/Chart.yaml b/charts/matrix/Chart.yaml
@@ -8,7 +8,7 @@ sources:
 
 type: application
 
-version: 4.6.2
+version: 4.6.3
 
 # renovate: image=matrixdotorg/synapse
 appVersion: v1.95.0

diff --git a/charts/matrix/README.md b/charts/matrix/README.md
@@ -1,6 +1,6 @@
 # matrix
 
-![Version: 4.6.2](https://img.shields.io/badge/Version-4.6.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.95.0](https://img.shields.io/badge/AppVersion-v1.95.0-informational?style=flat-square)
+![Version: 4.6.3](https://img.shields.io/badge/Version-4.6.3-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: v1.95.0](https://img.shields.io/badge/AppVersion-v1.95.0-informational?style=flat-square)
 
 A Helm chart to deploy a Matrix homeserver stack into Kubernetes
 

diff --git a/charts/matrix/templates/synapse/_homeserver.yaml b/charts/matrix/templates/synapse/_homeserver.yaml
@@ -1519,7 +1519,12 @@ oidc_config:
   # list of scopes to request. This should normally include the "openid" scope.
   # Defaults to ["openid"].
   #
-  scopes: {{ .Values.matrix.oidc_config.scopes }}
+  {{- if .Values.matrix.oidc_config.scopes }}
+  scopes:
+  {{- range .Values.matrix.oidc_config.scopes }}
+    - {{ . | quote }}
+  {{- end }}
+  {{- end }}
 
   # Uncomment to skip metadata verification. Defaults to false.
   #

diff --git a/charts/matrix/values.yaml b/charts/matrix/values.yaml
@@ -152,7 +152,9 @@ matrix:
 
     # -- list of scopes to request. should normally include the "openid" scope.
     # Defaults to ["openid"].
-    scopes: ["openid", "profile"]
+    scopes:
+      - "openid"
+      - "profile"
 
     # -- oauth2 authorization endpoint. Required if provider discovery disabled.
     authorization_endpoint: "https://accounts.example.com/oauth2/auth"