From 9c605ef2e55879baff91bc1a5f2d48bf88e9d00f Mon Sep 17 00:00:00 2001
From: kjeld Schouten-Lebbing <kjeld@schouten-lebbing.nl>
Date: Mon, 31 Jan 2022 20:36:36 +0100
Subject: [PATCH] fix(traefik/synapse): middleware tweaks

---
 charts/core/traefik/Chart.yaml                                | 2 +-
 .../core/traefik/templates/middlewares/basic-middleware.yaml  | 4 ++--
 charts/core/traefik/templates/middlewares/tc-synapse.yaml     | 3 +++
 charts/incubator/synapse/Chart.yaml                           | 2 +-
 charts/incubator/synapse/templates/common.yaml                | 2 +-
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/charts/core/traefik/Chart.yaml b/charts/core/traefik/Chart.yaml
index 078261eded3..5d4ede201de 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.47
+version: 10.0.48
 annotations:
   truecharts.org/catagories: |
     - network
diff --git a/charts/core/traefik/templates/middlewares/basic-middleware.yaml b/charts/core/traefik/templates/middlewares/basic-middleware.yaml
index fca94384953..144f94e7333 100644
--- a/charts/core/traefik/templates/middlewares/basic-middleware.yaml
+++ b/charts/core/traefik/templates/middlewares/basic-middleware.yaml
@@ -21,8 +21,8 @@ metadata:
   namespace: {{ $namespace }}
 spec:
   rateLimit:
-    average: 300
-    burst: 200
+    average: 600
+    burst: 400
 ---
 apiVersion: traefik.containo.us/v1alpha1
 kind: Middleware
diff --git a/charts/core/traefik/templates/middlewares/tc-synapse.yaml b/charts/core/traefik/templates/middlewares/tc-synapse.yaml
index 1cbcf00d7b2..259df10d0a4 100644
--- a/charts/core/traefik/templates/middlewares/tc-synapse.yaml
+++ b/charts/core/traefik/templates/middlewares/tc-synapse.yaml
@@ -23,4 +23,7 @@ metadata:
 spec:
   chain:
     middlewares:
+    - name: basic-ratelimit
+    - name: basic-secure-headers
     - name: tc-synapse-headers
+    - name: compress
diff --git a/charts/incubator/synapse/Chart.yaml b/charts/incubator/synapse/Chart.yaml
index c733c07fe5f..83152957c56 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.12
+version: 0.0.13
 annotations:
   truecharts.org/catagories: |
     - cloud
diff --git a/charts/incubator/synapse/templates/common.yaml b/charts/incubator/synapse/templates/common.yaml
index b1fbbbbb4cf..d4b17bf99d2 100644
--- a/charts/incubator/synapse/templates/common.yaml
+++ b/charts/incubator/synapse/templates/common.yaml
@@ -7,7 +7,7 @@
 {{/* Render secret for synapse */}}
 {{- include "synapse.secret" . }}
 
-{{- $newMiddlewares :=  append .Values.ingress.main.fixedMiddlewares "tc-synapse-chain" }}
+{{- $newMiddlewares :=  list "tc-synapse-chain" }}
 {{- $_ := set .Values.ingress.main "fixedMiddlewares" $newMiddlewares -}}
 
 {{/* Render the templates */}}