From d65a86aeb65fbf9cbdc5af5c2d266335ef46fa4d Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 31 Jan 2022 16:54:22 +0100
Subject: [PATCH] fix(synapse/traefik): Synapse related fixes

---
 charts/core/traefik/Chart.yaml                |  2 +-
 .../templates/middlewares/tc-synapse.yaml     | 25 +++++++++++++++++++
 charts/incubator/synapse/Chart.yaml           |  2 +-
 .../incubator/synapse/templates/_secret.tpl   |  4 +--
 .../incubator/synapse/templates/common.yaml   |  3 +++
 5 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 charts/core/traefik/templates/middlewares/tc-synapse.yaml

diff --git a/charts/core/traefik/Chart.yaml b/charts/core/traefik/Chart.yaml
index df80c8e183c..344ceea2ccd 100644
--- a/charts/core/traefik/Chart.yaml
+++ b/charts/core/traefik/Chart.yaml
@@ -22,7 +22,7 @@ sources:
 - https://github.com/traefik/traefik-helm-chart
 - https://traefik.io/
 type: application
-version: 10.0.44
+version: 10.0.45
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/core/traefik/templates/middlewares/tc-synapse.yaml b/charts/core/traefik/templates/middlewares/tc-synapse.yaml
new file mode 100644
index 00000000000..183dea0f761
--- /dev/null
+++ b/charts/core/traefik/templates/middlewares/tc-synapse.yaml
@@ -0,0 +1,25 @@
+{{- $values := .Values }}
+{{- $namespace := ( printf "ix-%s" .Release.Name ) }}
+{{- if or ( not .Values.ingressClass.enabled ) ( and ( .Values.ingressClass.enabled ) ( .Values.ingressClass.isDefaultClass ) ) }}
+{{- $namespace = "default" }}
+{{- end }}
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: tc-synapse-headers
+  namespace: {{ $namespace }}
+spec:
+  headers:
+    accesscontrolalloworigin: '*'
+
+---
+apiVersion: traefik.containo.us/v1alpha1
+kind: Middleware
+metadata:
+  name: tc-synapse-chain
+  namespace: {{ $namespace }}
+spec:
+  chain:
+    middlewares:
+    - name: tc-synapse-headers
diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml
index 45cc41971ce..b534d133e4b 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.8
+version: 0.0.9
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/synapse/templates/_secret.tpl b/charts/incubator/synapse/templates/_secret.tpl
index a1bb00a82b9..cd459d408dc 100644
--- a/charts/incubator/synapse/templates/_secret.tpl
+++ b/charts/incubator/synapse/templates/_secret.tpl
@@ -11,7 +11,7 @@ metadata:
     rollme: {{ randAlphaNum 5 | quote }}
 stringData:
   {{- $previous := lookup "v1" "Secret" .Release.Namespace "synapse-secret" }}
-  {{- $msk := "" }}
+  {{- $msk = randAlphaNum 50 }}
   secret.yaml: |
     {{- if .Values.mail.enabled }}
     email:
@@ -43,7 +43,7 @@ stringData:
     {{- if $previous }}
     {{- $msk = ( index $previous.data "macaroon_secret_key" )  }}
     {{- else }}
-    {{- $msk = randAlphaNum 50 }}
+
     {{- end }}
     macaroon_secret_key: {{ $msk }}
 
diff --git a/charts/incubator/synapse/templates/common.yaml b/charts/incubator/synapse/templates/common.yaml
index 1bac1bd32ee..b1fbbbbb4cf 100644
--- a/charts/incubator/synapse/templates/common.yaml
+++ b/charts/incubator/synapse/templates/common.yaml
@@ -7,5 +7,8 @@
 {{/* Render secret for synapse */}}
 {{- include "synapse.secret" . }}
 
+{{- $newMiddlewares :=  append .Values.ingress.main.fixedMiddlewares "tc-synapse-chain" }}
+{{- $_ := set .Values.ingress.main "fixedMiddlewares" $newMiddlewares -}}
+
 {{/* Render the templates */}}
 {{ include "common.postSetup" . }}