envoy merge_slashes, normalize_path

shcherbak · shcherbak · commit 8978375ac5e7 · 2026-06-08T23:26:29.000+03:00
diff --git a/charts/synapse/Chart.yaml b/charts/synapse/Chart.yaml
@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 1.151.0
 description: matrix synapse kubernetes deployment
 name: synapse
-version: 2.4.14
+version: 2.4.15
diff --git a/charts/synapse/templates/envoy-configmap.yaml b/charts/synapse/templates/envoy-configmap.yaml
@@ -61,6 +61,8 @@ data:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: ingress_http
                     xff_num_trusted_hops: 2
+                    merge_slashes: true
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
diff --git a/charts/synapse/tests/golden/fixtures/test-envoy-configmap-msc4306.golden.yaml b/charts/synapse/tests/golden/fixtures/test-envoy-configmap-msc4306.golden.yaml
@@ -64,6 +64,8 @@ data:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: ingress_http
                     xff_num_trusted_hops: 2
+                    merge_slashes: true
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
diff --git a/charts/synapse/tests/golden/fixtures/test-envoy-configmap-no-mas.golden.yaml b/charts/synapse/tests/golden/fixtures/test-envoy-configmap-no-mas.golden.yaml
@@ -64,6 +64,8 @@ data:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: ingress_http
                     xff_num_trusted_hops: 2
+                    merge_slashes: true
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
diff --git a/charts/synapse/tests/golden/fixtures/test-envoy-configmap.golden.yaml b/charts/synapse/tests/golden/fixtures/test-envoy-configmap.golden.yaml
@@ -64,6 +64,8 @@ data:
                     "@type": type.googleapis.com/envoy.extensions.filters.network.http_connection_manager.v3.HttpConnectionManager
                     stat_prefix: ingress_http
                     xff_num_trusted_hops: 2
+                    merge_slashes: true
+                    normalize_path: true
                     route_config:
                       name: local_route
                       virtual_hosts:
diff --git a/charts/synapse/tests/golden/fixtures/test-envoy-deployment.golden.yaml b/charts/synapse/tests/golden/fixtures/test-envoy-deployment.golden.yaml
@@ -24,7 +24,7 @@ spec:
         app: synapse
         component: synapse-client-reader-envoy
       annotations:
-        checksum/config: 9b75ea7e1ba15985054372641d08319b0f5715dfd631289b0a11ab10672b3d38
+        checksum/config: 7871cc315e55568339135531aa7453d1f5802c4e49d3939756e9875f06b9949e
     spec:
       terminationGracePeriodSeconds: 60
       containers:
