Skip to content

Commit cfb084f

Browse files
committed
fix
1 parent 1dd4616 commit cfb084f

7 files changed

Lines changed: 17 additions & 25 deletions

File tree

charts/synapse/Chart.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ apiVersion: v2
22
appVersion: 1.151.0
33
description: matrix synapse kubernetes deployment
44
name: synapse
5-
version: 2.5.0
5+
version: 2.5.1

charts/synapse/templates/envoy-configmap.yaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ data:
287287
cluster: httpd-client-keys
288288
{{- end }}
289289
290-
{{- range $route := .Values.ingress.clientEventsRoutes }}
290+
{{- range $route := .Values.ingress.clientEventsRoomRoutes }}
291291
- match:
292292
safe_regex:
293293
regex: {{ printf "^%s" $route | squote }}
@@ -304,6 +304,16 @@ data:
304304
name: room_hash
305305
{{- end }}
306306
307+
{{- range $route := .Values.ingress.clientEventsOtherRoutes }}
308+
- match:
309+
safe_regex:
310+
regex: {{ printf "^%s" $route | squote }}
311+
route:
312+
timeout: 300s
313+
auto_host_rewrite: true
314+
cluster: httpd-room-ring-hash
315+
{{- end }}
316+
307317
{{- range $route := .Values.ingress.clientReaderRoutes }}
308318
- match:
309319
safe_regex:

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -730,13 +730,6 @@ data:
730730
timeout: 300s
731731
auto_host_rewrite: true
732732
cluster: httpd-room-ring-hash
733-
hash_policy:
734-
- header:
735-
header_name: X-Hash-Key
736-
typed_per_filter_config:
737-
envoy.filters.http.lua:
738-
"@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
739-
name: room_hash
740733
- match:
741734
safe_regex:
742735
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -744,13 +744,6 @@ data:
744744
timeout: 300s
745745
auto_host_rewrite: true
746746
cluster: httpd-room-ring-hash
747-
hash_policy:
748-
- header:
749-
header_name: X-Hash-Key
750-
typed_per_filter_config:
751-
envoy.filters.http.lua:
752-
"@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
753-
name: room_hash
754747
- match:
755748
safe_regex:
756749
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -716,13 +716,6 @@ data:
716716
timeout: 300s
717717
auto_host_rewrite: true
718718
cluster: httpd-room-ring-hash
719-
hash_policy:
720-
- header:
721-
header_name: X-Hash-Key
722-
typed_per_filter_config:
723-
envoy.filters.http.lua:
724-
"@type": type.googleapis.com/envoy.extensions.filters.http.lua.v3.LuaPerRoute
725-
name: room_hash
726719
- match:
727720
safe_regex:
728721
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/createRoom'

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ spec:
2424
app: synapse
2525
component: synapse-client-reader-envoy
2626
annotations:
27-
checksum/config: ca5cc5235605c83a726768acbc9210947b2d5b565da6a55f3307dfd503651267
27+
checksum/config: 6f69be800850c4cefdba40fea8ea6ce8fd33b4822ec9cc59261a405597c3e0cf
2828
spec:
2929
terminationGracePeriodSeconds: 60
3030
containers:

charts/synapse/values.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -466,13 +466,16 @@ ingress:
466466
- '/_matrix/client/(r0|v3|unstable)/user_directory/search$'
467467

468468
# httpd-room-ring-hash envoy cluster
469-
clientEventsRoutes:
469+
clientEventsRoomRoutes:
470470
- '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact.*'
471471
- '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/send.*'
472472
- '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/.*'
473473
- '/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/(join|invite|leave|ban|unban|kick)'
474474
- '/_matrix/client/(api/v1|r0|v3|unstable)/join/.*'
475475
- '/_matrix/client/(api/v1|r0|v3|unstable)/knock/.*'
476+
477+
# httpd-room-ring-hash envoy cluster, no ring hash
478+
clientEventsOtherRoutes:
476479
- '/_matrix/client/(api/v1|r0|v3|unstable)/profile/.*'
477480

478481
# httpd-client-keys, LEAST_REQUEST

0 commit comments

Comments
 (0)