Skip to content

Commit 01e9839

Browse files
shcherbakshcherbak
committed
fix
1 parent 4d9b799 commit 01e9839

10 files changed

Lines changed: 151 additions & 154 deletions

‎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.4.7
5+
version: 2.4.8

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ data:
9797
value: "0"
9898
- match:
9999
safe_regex:
100-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)|register).*'
100+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)).*'
101101
route:
102102
timeout: 300s
103103
auto_host_rewrite: true
@@ -118,21 +118,21 @@ data:
118118
cluster: httpd-master
119119
- match:
120120
safe_regex:
121-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt.*'
121+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/receipt.*'
122122
route:
123123
timeout: 300s
124124
auto_host_rewrite: true
125125
cluster: httpd-receipts
126126
- match:
127127
safe_regex:
128-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers.*'
128+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/read_markers.*'
129129
route:
130130
timeout: 300s
131131
auto_host_rewrite: true
132132
cluster: httpd-receipts
133133
- match:
134134
safe_regex:
135-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing.*'
135+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/[^/]+/typing.*'
136136
route:
137137
timeout: 300s
138138
auto_host_rewrite: true
@@ -307,14 +307,14 @@ data:
307307
cluster: httpd-to-device
308308
- match:
309309
safe_regex:
310-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/tags.*'
310+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+/rooms/[^/]+/tags(/.*)?$'
311311
route:
312312
timeout: 300s
313313
auto_host_rewrite: true
314314
cluster: httpd-account-data
315315
- match:
316316
safe_regex:
317-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/account_data.*'
317+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+(/rooms/[^/]+)?/account_data(/.*)?$'
318318
route:
319319
timeout: 300s
320320
auto_host_rewrite: true
@@ -602,16 +602,6 @@ data:
602602
hash_policy:
603603
- connection_properties:
604604
source_ip: true
605-
- match:
606-
safe_regex:
607-
regex: '^/_matrix/client/unstable/org.matrix.msc4140/delayed_events(/.*/restart)?$'
608-
route:
609-
timeout: 300s
610-
auto_host_rewrite: true
611-
cluster: httpd-federation-ip-hash
612-
hash_policy:
613-
- connection_properties:
614-
source_ip: true
615605
- match:
616606
safe_regex:
617607
regex: '^/_matrix/client/(r0|v3|unstable)/user_directory/search$'
@@ -885,6 +875,13 @@ data:
885875
timeout: 300s
886876
auto_host_rewrite: true
887877
cluster: httpd-client-reader
878+
- match:
879+
safe_regex:
880+
regex: '^/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events(/.*/restart)?$'
881+
route:
882+
timeout: 300s
883+
auto_host_rewrite: true
884+
cluster: httpd-client-reader
888885
- match:
889886
safe_regex:
890887
regex: '^/_matrix/.*'

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

Lines changed: 48 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ data:
9797
value: "0"
9898
- match:
9999
safe_regex:
100-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)|register).*'
100+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)).*'
101101
route:
102102
timeout: 300s
103103
auto_host_rewrite: true
@@ -118,21 +118,56 @@ data:
118118
cluster: httpd-master
119119
- match:
120120
safe_regex:
121-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt.*'
121+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/login$'
122+
route:
123+
timeout: 300s
124+
auto_host_rewrite: true
125+
cluster: httpd-client-reader
126+
- match:
127+
safe_regex:
128+
regex: '^/_matrix/client/(r0|v3|unstable)/register$'
129+
route:
130+
timeout: 300s
131+
auto_host_rewrite: true
132+
cluster: httpd-client-reader
133+
- match:
134+
safe_regex:
135+
regex: '^/_matrix/client/(r0|v3|unstable)/register/available$'
136+
route:
137+
timeout: 300s
138+
auto_host_rewrite: true
139+
cluster: httpd-client-reader
140+
- match:
141+
safe_regex:
142+
regex: '^/_matrix/client/v1/register/m.login.registration_token/validity$'
143+
route:
144+
timeout: 300s
145+
auto_host_rewrite: true
146+
cluster: httpd-client-reader
147+
- match:
148+
safe_regex:
149+
regex: '^/_matrix/client/(r0|v3|unstable)/password_policy$'
150+
route:
151+
timeout: 300s
152+
auto_host_rewrite: true
153+
cluster: httpd-client-reader
154+
- match:
155+
safe_regex:
156+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/receipt.*'
122157
route:
123158
timeout: 300s
124159
auto_host_rewrite: true
125160
cluster: httpd-receipts
126161
- match:
127162
safe_regex:
128-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers.*'
163+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/read_markers.*'
129164
route:
130165
timeout: 300s
131166
auto_host_rewrite: true
132167
cluster: httpd-receipts
133168
- match:
134169
safe_regex:
135-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing.*'
170+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/[^/]+/typing.*'
136171
route:
137172
timeout: 300s
138173
auto_host_rewrite: true
@@ -293,14 +328,14 @@ data:
293328
cluster: httpd-to-device
294329
- match:
295330
safe_regex:
296-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/tags.*'
331+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+/rooms/[^/]+/tags(/.*)?$'
297332
route:
298333
timeout: 300s
299334
auto_host_rewrite: true
300335
cluster: httpd-account-data
301336
- match:
302337
safe_regex:
303-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/account_data.*'
338+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+(/rooms/[^/]+)?/account_data(/.*)?$'
304339
route:
305340
timeout: 300s
306341
auto_host_rewrite: true
@@ -588,58 +623,13 @@ data:
588623
hash_policy:
589624
- connection_properties:
590625
source_ip: true
591-
- match:
592-
safe_regex:
593-
regex: '^/_matrix/client/unstable/org.matrix.msc4140/delayed_events(/.*/restart)?$'
594-
route:
595-
timeout: 300s
596-
auto_host_rewrite: true
597-
cluster: httpd-federation-ip-hash
598-
hash_policy:
599-
- connection_properties:
600-
source_ip: true
601626
- match:
602627
safe_regex:
603628
regex: '^/_matrix/client/(r0|v3|unstable)/user_directory/search$'
604629
route:
605630
timeout: 300s
606631
auto_host_rewrite: true
607632
cluster: httpd-user-dir
608-
- match:
609-
safe_regex:
610-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/login$'
611-
route:
612-
timeout: 300s
613-
auto_host_rewrite: true
614-
cluster: httpd-client-reader
615-
- match:
616-
safe_regex:
617-
regex: '^/_matrix/client/(r0|v3|unstable)/register$'
618-
route:
619-
timeout: 300s
620-
auto_host_rewrite: true
621-
cluster: httpd-client-reader
622-
- match:
623-
safe_regex:
624-
regex: '^/_matrix/client/(r0|v3|unstable)/register/available$'
625-
route:
626-
timeout: 300s
627-
auto_host_rewrite: true
628-
cluster: httpd-client-reader
629-
- match:
630-
safe_regex:
631-
regex: '^/_matrix/client/v1/register/m.login.registration_token/validity$'
632-
route:
633-
timeout: 300s
634-
auto_host_rewrite: true
635-
cluster: httpd-client-reader
636-
- match:
637-
safe_regex:
638-
regex: '^/_matrix/client/(r0|v3|unstable)/password_policy$'
639-
route:
640-
timeout: 300s
641-
auto_host_rewrite: true
642-
cluster: httpd-client-reader
643633
- match:
644634
safe_regex:
645635
regex: '^/_matrix/client/(r0|v3|unstable)/keys/changes$'
@@ -878,6 +868,13 @@ data:
878868
timeout: 300s
879869
auto_host_rewrite: true
880870
cluster: httpd-client-reader
871+
- match:
872+
safe_regex:
873+
regex: '^/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events(/.*/restart)?$'
874+
route:
875+
timeout: 300s
876+
auto_host_rewrite: true
877+
cluster: httpd-client-reader
881878
- match:
882879
safe_regex:
883880
regex: '^/_matrix/.*'

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

Lines changed: 13 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ data:
9797
value: "0"
9898
- match:
9999
safe_regex:
100-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)|register).*'
100+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/(account/3pid/|directory/list/room/|rooms/[^/]+/(forget|upgrade|report)).*'
101101
route:
102102
timeout: 300s
103103
auto_host_rewrite: true
@@ -118,21 +118,21 @@ data:
118118
cluster: httpd-master
119119
- match:
120120
safe_regex:
121-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/receipt.*'
121+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/receipt.*'
122122
route:
123123
timeout: 300s
124124
auto_host_rewrite: true
125125
cluster: httpd-receipts
126126
- match:
127127
safe_regex:
128-
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers.*'
128+
regex: '^/_matrix/client/(r0|v3|unstable)/rooms/[^/]+/read_markers.*'
129129
route:
130130
timeout: 300s
131131
auto_host_rewrite: true
132132
cluster: httpd-receipts
133133
- match:
134134
safe_regex:
135-
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/typing.*'
135+
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/[^/]+/typing.*'
136136
route:
137137
timeout: 300s
138138
auto_host_rewrite: true
@@ -293,14 +293,14 @@ data:
293293
cluster: httpd-to-device
294294
- match:
295295
safe_regex:
296-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/tags.*'
296+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+/rooms/[^/]+/tags(/.*)?$'
297297
route:
298298
timeout: 300s
299299
auto_host_rewrite: true
300300
cluster: httpd-account-data
301301
- match:
302302
safe_regex:
303-
regex: '^/_matrix/client/(r0|v3|unstable)/.*/account_data.*'
303+
regex: '^/_matrix/client/(r0|v3|unstable)/user/[^/]+(/rooms/[^/]+)?/account_data(/.*)?$'
304304
route:
305305
timeout: 300s
306306
auto_host_rewrite: true
@@ -588,16 +588,6 @@ data:
588588
hash_policy:
589589
- connection_properties:
590590
source_ip: true
591-
- match:
592-
safe_regex:
593-
regex: '^/_matrix/client/unstable/org.matrix.msc4140/delayed_events(/.*/restart)?$'
594-
route:
595-
timeout: 300s
596-
auto_host_rewrite: true
597-
cluster: httpd-federation-ip-hash
598-
hash_policy:
599-
- connection_properties:
600-
source_ip: true
601591
- match:
602592
safe_regex:
603593
regex: '^/_matrix/client/(r0|v3|unstable)/user_directory/search$'
@@ -871,6 +861,13 @@ data:
871861
timeout: 300s
872862
auto_host_rewrite: true
873863
cluster: httpd-client-reader
864+
- match:
865+
safe_regex:
866+
regex: '^/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events(/.*/restart)?$'
867+
route:
868+
timeout: 300s
869+
auto_host_rewrite: true
870+
cluster: httpd-client-reader
874871
- match:
875872
safe_regex:
876873
regex: '^/_matrix/.*'

‎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: 4e5e008b7f7d9a5463aff65090872424c71bfd2f62a244863c06c80082de0999
27+
checksum/config: 679b8470f5deb415adddf6d7dd5ec56b98028b00cdb102015e4941a44d837cb5
2828
spec:
2929
terminationGracePeriodSeconds: 60
3030
containers:

0 commit comments

Comments
 (0)