diff --git a/incubator/synapse/0.0.11/CHANGELOG.md b/incubator/synapse/0.0.12/CHANGELOG.md similarity index 92% rename from incubator/synapse/0.0.11/CHANGELOG.md rename to incubator/synapse/0.0.12/CHANGELOG.md index c751f37b51..9311933b6d 100644 --- a/incubator/synapse/0.0.11/CHANGELOG.md +++ b/incubator/synapse/0.0.12/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog
+ +### [synapse-0.0.12](https://github.com/truecharts/apps/compare/synapse-0.0.11...synapse-0.0.12) (2022-01-31) + +#### Fix + +* secret tweaking + + + ### [synapse-0.0.11](https://github.com/truecharts/apps/compare/synapse-0.0.10...synapse-0.0.11) (2022-01-31) diff --git a/incubator/synapse/0.0.11/CONFIG.md b/incubator/synapse/0.0.12/CONFIG.md similarity index 100% rename from incubator/synapse/0.0.11/CONFIG.md rename to incubator/synapse/0.0.12/CONFIG.md diff --git a/incubator/synapse/0.0.11/Chart.lock b/incubator/synapse/0.0.12/Chart.lock similarity index 84% rename from incubator/synapse/0.0.11/Chart.lock rename to incubator/synapse/0.0.12/Chart.lock index 81d987b65f..ee5383d319 100644 --- a/incubator/synapse/0.0.11/Chart.lock +++ b/incubator/synapse/0.0.12/Chart.lock @@ -6,4 +6,4 @@ dependencies: repository: https://truecharts.org/ version: 6.0.58 digest: sha256:a28ed48da9797a2e9d6e9a194aa6f65b07fc1cc0169d5ffdb0ba7c44c94806b1 -generated: "2022-01-31T18:04:44.450875118Z" +generated: "2022-01-31T18:34:51.420567497Z" diff --git a/incubator/synapse/0.0.11/Chart.yaml b/incubator/synapse/0.0.12/Chart.yaml similarity index 97% rename from incubator/synapse/0.0.11/Chart.yaml rename to incubator/synapse/0.0.12/Chart.yaml index 1ab73b376f..c733c07fe5 100644 --- a/incubator/synapse/0.0.11/Chart.yaml +++ b/incubator/synapse/0.0.12/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/incubator/synapse/0.0.11/README.md b/incubator/synapse/0.0.12/README.md similarity index 100% rename from incubator/synapse/0.0.11/README.md rename to incubator/synapse/0.0.12/README.md diff --git a/incubator/synapse/0.0.11/app-readme.md b/incubator/synapse/0.0.12/app-readme.md similarity index 100% rename from incubator/synapse/0.0.11/app-readme.md rename to incubator/synapse/0.0.12/app-readme.md diff --git a/incubator/synapse/0.0.11/charts/common-8.14.2.tgz b/incubator/synapse/0.0.12/charts/common-8.14.2.tgz similarity index 100% rename from incubator/synapse/0.0.11/charts/common-8.14.2.tgz rename to incubator/synapse/0.0.12/charts/common-8.14.2.tgz diff --git a/incubator/synapse/0.0.11/charts/postgresql-6.0.58.tgz b/incubator/synapse/0.0.12/charts/postgresql-6.0.58.tgz similarity index 100% rename from incubator/synapse/0.0.11/charts/postgresql-6.0.58.tgz rename to incubator/synapse/0.0.12/charts/postgresql-6.0.58.tgz diff --git a/incubator/synapse/0.0.11/ci/base-values.yaml b/incubator/synapse/0.0.12/ci/base-values.yaml similarity index 100% rename from incubator/synapse/0.0.11/ci/base-values.yaml rename to incubator/synapse/0.0.12/ci/base-values.yaml diff --git a/incubator/synapse/0.0.11/ci/basic-values.yaml b/incubator/synapse/0.0.12/ci/basic-values.yaml similarity index 100% rename from incubator/synapse/0.0.11/ci/basic-values.yaml rename to incubator/synapse/0.0.12/ci/basic-values.yaml diff --git a/incubator/synapse/0.0.11/helm-values.md b/incubator/synapse/0.0.12/helm-values.md similarity index 100% rename from incubator/synapse/0.0.11/helm-values.md rename to incubator/synapse/0.0.12/helm-values.md diff --git a/incubator/synapse/0.0.11/ix_values.yaml b/incubator/synapse/0.0.12/ix_values.yaml similarity index 100% rename from incubator/synapse/0.0.11/ix_values.yaml rename to incubator/synapse/0.0.12/ix_values.yaml diff --git a/incubator/synapse/0.0.11/questions.yaml b/incubator/synapse/0.0.12/questions.yaml similarity index 100% rename from incubator/synapse/0.0.11/questions.yaml rename to incubator/synapse/0.0.12/questions.yaml diff --git a/incubator/synapse/0.0.11/security.md b/incubator/synapse/0.0.12/security.md similarity index 100% rename from incubator/synapse/0.0.11/security.md rename to incubator/synapse/0.0.12/security.md diff --git a/incubator/synapse/0.0.11/templates/_configmap.tpl b/incubator/synapse/0.0.12/templates/_configmap.tpl similarity index 100% rename from incubator/synapse/0.0.11/templates/_configmap.tpl rename to incubator/synapse/0.0.12/templates/_configmap.tpl diff --git a/incubator/synapse/0.0.11/templates/_helpers.tpl b/incubator/synapse/0.0.12/templates/_helpers.tpl similarity index 100% rename from incubator/synapse/0.0.11/templates/_helpers.tpl rename to incubator/synapse/0.0.12/templates/_helpers.tpl diff --git a/incubator/synapse/0.0.11/templates/_secret.tpl b/incubator/synapse/0.0.12/templates/_secret.tpl similarity index 77% rename from incubator/synapse/0.0.11/templates/_secret.tpl rename to incubator/synapse/0.0.12/templates/_secret.tpl index 57705ad005..4c9e263709 100644 --- a/incubator/synapse/0.0.11/templates/_secret.tpl +++ b/incubator/synapse/0.0.12/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 -}} diff --git a/incubator/synapse/0.0.11/templates/common.yaml b/incubator/synapse/0.0.12/templates/common.yaml similarity index 100% rename from incubator/synapse/0.0.11/templates/common.yaml rename to incubator/synapse/0.0.12/templates/common.yaml diff --git a/incubator/synapse/0.0.11/values.yaml b/incubator/synapse/0.0.12/values.yaml similarity index 100% rename from incubator/synapse/0.0.11/values.yaml rename to incubator/synapse/0.0.12/values.yaml