Merge pull request #564 from element-hq/bbz/mas-0.17.0

MAS 0.17.1

Author: benbz

charts/matrix-stack/configs/matrix-authentication-service/config.yaml.tpl

@@ -83,8 +83,16 @@ clients:
 {{- end }}
 
 secrets:
-  encryption: ${ENCRYPTION_SECRET}
-
+  encryption_file: /secrets/{{
+                include "element-io.ess-library.init-secret-path" (
+                      dict "root" $root
+                      "context" (dict
+                        "secretPath" "matrixAuthenticationService.encryptionSecret"
+                        "initSecretKey" "MAS_ENCRYPTION_SECRET"
+                        "defaultSecretName" (include "element-io.matrix-authentication-service.secret-name" (dict "root" $root "context" .))
+                        "defaultSecretKey" "ENCRYPTION_SECRET"
+                      )
+                    ) }}
   keys:
 {{- with required "privateKeys is required for Matrix Authentication Service" .privateKeys }}
   - kid: rsa

charts/matrix-stack/source/matrixAuthenticationService.yaml.j2

@@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 {% import "common/sub_schema_values.yaml.j2" as sub_schema_values %}
 enabled: true
-{{- sub_schema_values.image(registry='ghcr.io', repository='element-hq/matrix-authentication-service', tag='0.16.0') }}
+{{- sub_schema_values.image(registry='ghcr.io', repository='element-hq/matrix-authentication-service', tag='0.17.1') }}
 
 replicas: 1
 
@@ -60,7 +60,7 @@ syn2mas:
   enabled: false
 
   # Syn2Mas relies on the debug image to copy mas-cli to the matrix-tools container
-  {{- sub_schema_values.image(registry='ghcr.io', repository='element-hq/matrix-authentication-service', tag='0.16.0-debug') | indent(2) }}
+  {{- sub_schema_values.image(registry='ghcr.io', repository='element-hq/matrix-authentication-service', tag='0.17.1-debug') | indent(2) }}
   {{- sub_schema_values.labels() | indent(2) -}}
   {{- sub_schema_values.workloadAnnotations() | indent(2) -}}
   {{- sub_schema_values.containersSecurityContext() | indent(2) -}}

charts/matrix-stack/templates/matrix-authentication-service/_helpers.tpl

@@ -128,21 +128,6 @@ env:
           )
         )
     }}
-- name: ENCRYPTION_SECRET
-  value: >-
-    {{
-      printf "{{ readfile \"/secrets/%s\" | quote }}" (
-          include "element-io.ess-library.init-secret-path" (
-              dict "root" $root
-              "context" (dict
-                "secretPath" "matrixAuthenticationService.encryptionSecret"
-                "initSecretKey" "MAS_ENCRYPTION_SECRET"
-                "defaultSecretName" (include "element-io.matrix-authentication-service.secret-name" (dict "root" $root "context" .))
-                "defaultSecretKey" "ENCRYPTION_SECRET"
-              )
-          )
-        )
-    }}
 {{- /*
   This is the secrets shared between Synapse & MAS
 */ -}}

charts/matrix-stack/values.yaml

@@ -1356,7 +1356,7 @@ matrixAuthenticationService:
 
     ## The tag of the container image to use.
     ## One of tag or digest must be provided.
-    tag: "0.16.0"
+    tag: "0.17.1"
 
     ## Container digest to use. Used to pull the image instead of the image tag if set
     ## The tag will still be set as the app.kubernetes.io/version label
@@ -1775,7 +1775,7 @@ matrixAuthenticationService:
 
       ## The tag of the container image to use.
       ## One of tag or digest must be provided.
-      tag: "0.16.0-debug"
+      tag: "0.17.1-debug"
 
       ## Container digest to use. Used to pull the image instead of the image tag if set
       ## The tag will still be set as the app.kubernetes.io/version label

newsfragments/564.changed.md

@@ -0,0 +1,8 @@
+Upgrade Matrix Authentication Service to v0.17.1.
+
+Highlights:
+* Support Registration Tokens
+
+Full changelog:
+* [v0.17.0](https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.17.0)
+* [v0.17.1](https://github.com/element-hq/matrix-authentication-service/releases/tag/v0.17.1)