diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml index 1ab73b376f6..c733c07fe5f 100644 --- a/charts/incubator/synapse/Chart.yaml +++ b/charts/incubator/synapse/Chart.yaml @@ -24,7 +24,7 @@ maintainers: name: synapse sources: [] type: application -version: 0.0.11 +version: 0.0.12 annotations: truecharts.org/catagories: | - cloud diff --git a/charts/incubator/synapse/templates/_secret.tpl b/charts/incubator/synapse/templates/_secret.tpl index 57705ad0054..4c9e263709d 100644 --- a/charts/incubator/synapse/templates/_secret.tpl +++ b/charts/incubator/synapse/templates/_secret.tpl @@ -1,5 +1,21 @@ {{/* Define the configs */}} {{- define "synapse.secret" -}} +{{- $previous := lookup "v1" "Secret" .Release.Namespace "synapse-secret-macaroon" }} +{{- $msk := randAlphaNum 50 }} +{{- if $previous }} +{{- $msk = ( index $previous.data "key" ) | b64dec }} +{{- end }} +--- +apiVersion: v1 +kind: Secret +metadata: + name: synapse-secret-macaroon + labels: + {{ include "common.labels" . | nindent 4 }} + annotations: + rollme: {{ randAlphaNum 5 | quote }} +data: + key: {{ $msk | b64enc }} --- apiVersion: v1 kind: Secret @@ -10,8 +26,6 @@ metadata: annotations: rollme: {{ randAlphaNum 5 | quote }} stringData: - {{- $previous := lookup "v1" "Secret" .Release.Namespace "synapse-secret" }} - {{- $msk := randAlphaNum 50 }} secret.yaml: | {{- if .Values.mail.enabled }} email: @@ -40,9 +54,6 @@ stringData: registration_shared_secret: {{ .Values.matrix.registration.sharedSecret }} {{- end }} - {{- if $previous }} - {{- $msk = ( index $previous.stringData "macaroon_secret_key" ) }} - {{- end }} macaroon_secret_key: {{ $msk }} {{- if .Values.coturn.enabled -}}