fix

Author: shcherbak

charts/synapse/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 1.151.0
 description: matrix synapse kubernetes deployment
 name: synapse
-version: 2.5.0
+version: 2.5.1

charts/synapse/templates/envoy-configmap.yaml

@@ -287,7 +287,7 @@ data:
                                 cluster: httpd-client-keys
                             {{- end }}
 
-                            {{- range $route := .Values.ingress.clientEventsRoutes }}
+                            {{- range $route := .Values.ingress.clientEventsRoomRoutes }}
                             - match:
                                 safe_regex:
                                   regex: {{ printf "^%s" $route | squote }}
@@ -304,6 +304,16 @@ data:
                                   name: room_hash
                             {{- end }}
 
+                            {{- range $route := .Values.ingress.clientEventsOtherRoutes }}
+                            - match:
+                                safe_regex:
+                                  regex: {{ printf "^%s" $route | squote }}
+                              route:
+                                timeout: 300s
+                                auto_host_rewrite: true
+                                cluster: httpd-room-ring-hash
+                            {{- end }}
+
                             {{- range $route := .Values.ingress.clientReaderRoutes }}
                             - match:
                                 safe_regex:

charts/synapse/tests/golden/fixtures/test-envoy-configmap-msc4306.golden.yaml

@@ -730,13 +730,6 @@ data:
                                 timeout: 300s
                                 auto_host_rewrite: true
                                 cluster: httpd-room-ring-hash
-                                hash_policy:
-                                  - header:
-                                      header_name: X-Hash-Key
-                              typed_per_filter_config:
-                                envoy.filters.http.lua:
-                                  "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
-                                  name: room_hash
                             - match:
                                 safe_regex:
                                   regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

charts/synapse/tests/golden/fixtures/test-envoy-configmap-no-mas.golden.yaml

@@ -744,13 +744,6 @@ data:
                                 timeout: 300s
                                 auto_host_rewrite: true
                                 cluster: httpd-room-ring-hash
-                                hash_policy:
-                                  - header:
-                                      header_name: X-Hash-Key
-                              typed_per_filter_config:
-                                envoy.filters.http.lua:
-                                  "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
-                                  name: room_hash
                             - match:
                                 safe_regex:
                                   regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

charts/synapse/tests/golden/fixtures/test-envoy-configmap.golden.yaml

@@ -716,13 +716,6 @@ data:
                                 timeout: 300s
                                 auto_host_rewrite: true
                                 cluster: httpd-room-ring-hash
-                                hash_policy:
-                                  - header:
-                                      header_name: X-Hash-Key
-                              typed_per_filter_config:
-                                envoy.filters.http.lua:
-                                  "@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
-                                  name: room_hash
                             - match:
                                 safe_regex:
                                   regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

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: ca5cc5235605c83a726768acbc9210947b2d5b565da6a55f3307dfd503651267
+        checksum/config: 6f69be800850c4cefdba40fea8ea6ce8fd33b4822ec9cc59261a405597c3e0cf
     spec:
       terminationGracePeriodSeconds: 60
       containers:

charts/synapse/values.yaml

@@ -466,13 +466,16 @@ ingress:
     - '/_matrix/client/(r0|v3|unstable)/user_directory/search$'
 
   # httpd-room-ring-hash envoy cluster
-  clientEventsRoutes:
+  clientEventsRoomRoutes:
     - '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact.*'
     - '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send.*'
     - '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/.*'
     - '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)'
     - '/_matrix/client/(api/v1|r0|v3|unstable)/join/.*'
     - '/_matrix/client/(api/v1|r0|v3|unstable)/knock/.*'
+
+  # httpd-room-ring-hash envoy cluster, no ring hash
+  clientEventsOtherRoutes:
     - '/_matrix/client/(api/v1|r0|v3|unstable)/profile/.*'
 
   # httpd-client-keys, LEAST_REQUEST