Skip to content

Commit 247fa3a

Browse files
shcherbakshcherbak
authored
V1.155.0 (#35)
* 1.155.1 (quarantined media stream writer) * synapse-quarantined-media-changes-headless * envoy-1.37
1 parent ce41794 commit 247fa3a

25 files changed

Lines changed: 1127 additions & 71 deletions

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
VERSION=v1.151.0
1+
VERSION=v1.155.0
22

33
.PHONY: all build-main push-main build-e2e push-e2e test-lua
44

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ Worker reference table
8181
| receipts | stream writer | yes | round-robin | yes |
8282
| device_lists | stream writer | yes | round-robin | yes |
8383
| thread_subscriptions | stream writer | yes | round-robin | yes |
84-
| quarantined_media | stream writer | yes | round-robin | yes |
84+
| quarantined_media_changes | stream writer | yes | round-robin (?) | yes |
8585
| events (persister) | stream writer | yes | shard by room_id | yes |
8686
| media_repository | app | yes | least_conn | yes |
8787
| media_instance_running_background_jobs | app | no | - | no |

‎build/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
ARG SYNAPSE_PKG_VER="v1.151.0"
1+
ARG SYNAPSE_PKG_VER="v1.155.0"
22
ARG PYTHON_PKG_VER="3.13"
33

44
# stage 1 : build pip

‎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.7.0
5+
version: 2.8.0

‎charts/synapse/templates/_helpers.tpl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,14 @@ app: synapse
3838
component: synapse-federation-reader
3939
{{- end }}
4040

41+
{{/*
42+
Selector labels
43+
*/}}
44+
{{- define "synapse-quarantined-media-changes.selectorLabels" -}}
45+
app: synapse
46+
component: synapse-quarantined-media-changes
47+
{{- end }}
48+
4149
{{/*
4250
Selector labels
4351
*/}}

‎charts/synapse/templates/envoy-configmap.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,16 @@ data:
175175
cluster: httpd-media-repository
176176
{{- end }}
177177
178+
{{- range $route := .Values.ingress.quarantineMediaChangesRoutes }}
179+
- match:
180+
safe_regex:
181+
regex: {{ printf "^%s" $route | squote }}
182+
route:
183+
timeout: 300s
184+
auto_host_rewrite: true
185+
cluster: httpd-quarantined-media-changes
186+
{{- end }}
187+
178188
{{- range $route := .Values.ingress.toDeviceRoutes }}
179189
- match:
180190
safe_regex:
@@ -921,6 +931,33 @@ data:
921931
socket_address:
922932
address: synapse-media-repository
923933
port_value: 8008
934+
- name: httpd-quarantined-media-changes
935+
connect_timeout: 1.00s
936+
type: STRICT_DNS
937+
dns_lookup_family: V4_ONLY
938+
ignore_health_on_host_removal: true
939+
lb_policy: LEAST_REQUEST
940+
least_request_lb_config:
941+
choice_count: 2
942+
circuit_breakers:
943+
thresholds:
944+
- priority: DEFAULT
945+
max_connections: 30000
946+
max_requests: 8192
947+
max_retries: 3
948+
- priority: HIGH
949+
max_connections: 30000
950+
max_requests: 8192
951+
max_retries: 3
952+
load_assignment:
953+
cluster_name: httpd-quarantined-media-changes
954+
endpoints:
955+
- lb_endpoints:
956+
- endpoint:
957+
address:
958+
socket_address:
959+
address: synapse-quarantined-media-changes-headless
960+
port_value: 8008
924961
925962
synapse.lua: |
926963
{{- .Files.Get "scripts/synapse.lua" | nindent 4 }}

‎charts/synapse/templates/synapse-secret.yaml‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
{{- $clientFedWorkers := list "master" "room" }}
55
{{- $noHttpWorkers := list "background_worker" "pusher" }}
66
{{- $streamWritersLocks := list "account_data"}}
7-
{{- $streamWriters := list "master" "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media" "event_persister" }}
8-
{{- $replicationWorkers := list "master" "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media" "event_persister" "federation_sender" }}
9-
{{- $clientOnlyWorkers := list "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media" "event_persister" "sync" "client_reader" "client_keys" "user_dir" }}
7+
{{- $streamWriters := list "master" "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media_changes" "event_persister" }}
8+
{{- $replicationWorkers := list "master" "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media_changes" "event_persister" "federation_sender" }}
9+
{{- $clientOnlyWorkers := list "typing" "to_device" "account_data" "presence" "push_rules" "receipts" "device_lists" "thread_subscriptions" "quarantined_media_changes" "event_persister" "sync" "client_reader" "client_keys" "user_dir" }}
1010

1111
{{- $registration_shared_secret := .Values.registration_shared_secret }}
1212
{{- $form_secret := .Values.form_secret }}
@@ -196,6 +196,11 @@ stringData:
196196
host: synapse-federation-sender-{{ . }}.synapse-federation-sender
197197
port: 9093
198198
{{- end }}
199+
{{- range until ( $workers.quarantined_media_changes.replicas | int) }}
200+
synapse-quarantined-media-changes-{{ . }}:
201+
host: synapse-quarantined-media-changes-{{ . }}.synapse-quarantined-media-changes
202+
port: 9093
203+
{{- end }}
199204
stream_writers:
200205
typing:
201206
- synapse-typing-0
@@ -225,6 +230,10 @@ stringData:
225230
{{- range until ( $workers.event_persister.replicas | int) }}
226231
- synapse-event-persister-{{ . }}
227232
{{- end }}
233+
quarantined_media_changes:
234+
{{- range until ( $workers.quarantined_media_changes.replicas | int) }}
235+
- synapse-quarantined-media-changes-{{ . }}
236+
{{- end }}
228237
start_pushers: false
229238
pusher_instances:
230239
{{- range until ( $workers.pusher.replicas | int) }}

‎charts/synapse/templates/synapse-service.yaml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,3 +122,23 @@ spec:
122122
targetPort: 8008
123123
selector:
124124
{{- include "synapse-federation-reader.selectorLabels" . | nindent 6 }}
125+
---
126+
apiVersion: v1
127+
kind: Service
128+
metadata:
129+
name: synapse-quarantined-media-changes-headless
130+
{{- with $.Values.synapse.service.annotations }}
131+
annotations:
132+
{{- toYaml . | nindent 4 }}
133+
{{- end }}
134+
labels:
135+
{{- include "synapse-quarantined-media-changes.selectorLabels" . | nindent 4 }}
136+
spec:
137+
clusterIP: None
138+
type: ClusterIP
139+
ports:
140+
- name: http
141+
port: 8008
142+
targetPort: 8008
143+
selector:
144+
{{- include "synapse-quarantined-media-changes.selectorLabels" . | nindent 6 }}

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

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -274,18 +274,18 @@ data:
274274
cluster: httpd-media-repository
275275
- match:
276276
safe_regex:
277-
regex: '^/_synapse/admin/v1/quarantine_media/.*'
277+
regex: '^/_synapse/admin/v1/users/.*/media'
278278
route:
279279
timeout: 300s
280280
auto_host_rewrite: true
281281
cluster: httpd-media-repository
282282
- match:
283283
safe_regex:
284-
regex: '^/_synapse/admin/v1/users/.*/media'
284+
regex: '^/_synapse/admin/v1/quarantine_media/.*'
285285
route:
286286
timeout: 300s
287287
auto_host_rewrite: true
288-
cluster: httpd-media-repository
288+
cluster: httpd-quarantined-media-changes
289289
- match:
290290
safe_regex:
291291
regex: '^/_matrix/client/(r0|v3|unstable)/sendToDevice/.*'
@@ -1535,6 +1535,33 @@ data:
15351535
socket_address:
15361536
address: synapse-media-repository
15371537
port_value: 8008
1538+
- name: httpd-quarantined-media-changes
1539+
connect_timeout: 1.00s
1540+
type: STRICT_DNS
1541+
dns_lookup_family: V4_ONLY
1542+
ignore_health_on_host_removal: true
1543+
lb_policy: LEAST_REQUEST
1544+
least_request_lb_config:
1545+
choice_count: 2
1546+
circuit_breakers:
1547+
thresholds:
1548+
- priority: DEFAULT
1549+
max_connections: 30000
1550+
max_requests: 8192
1551+
max_retries: 3
1552+
- priority: HIGH
1553+
max_connections: 30000
1554+
max_requests: 8192
1555+
max_retries: 3
1556+
load_assignment:
1557+
cluster_name: httpd-quarantined-media-changes
1558+
endpoints:
1559+
- lb_endpoints:
1560+
- endpoint:
1561+
address:
1562+
socket_address:
1563+
address: synapse-quarantined-media-changes-headless
1564+
port_value: 8008
15381565
15391566
synapse.lua: |
15401567
local room_id_pattern = "(![A-Za-z0-9._=%%%-/]+:[A-Za-z0-9.%-]+)"

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

Lines changed: 30 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -295,18 +295,18 @@ data:
295295
cluster: httpd-media-repository
296296
- match:
297297
safe_regex:
298-
regex: '^/_synapse/admin/v1/quarantine_media/.*'
298+
regex: '^/_synapse/admin/v1/users/.*/media'
299299
route:
300300
timeout: 300s
301301
auto_host_rewrite: true
302302
cluster: httpd-media-repository
303303
- match:
304304
safe_regex:
305-
regex: '^/_synapse/admin/v1/users/.*/media'
305+
regex: '^/_synapse/admin/v1/quarantine_media/.*'
306306
route:
307307
timeout: 300s
308308
auto_host_rewrite: true
309-
cluster: httpd-media-repository
309+
cluster: httpd-quarantined-media-changes
310310
- match:
311311
safe_regex:
312312
regex: '^/_matrix/client/(r0|v3|unstable)/sendToDevice/.*'
@@ -1495,6 +1495,33 @@ data:
14951495
socket_address:
14961496
address: synapse-media-repository
14971497
port_value: 8008
1498+
- name: httpd-quarantined-media-changes
1499+
connect_timeout: 1.00s
1500+
type: STRICT_DNS
1501+
dns_lookup_family: V4_ONLY
1502+
ignore_health_on_host_removal: true
1503+
lb_policy: LEAST_REQUEST
1504+
least_request_lb_config:
1505+
choice_count: 2
1506+
circuit_breakers:
1507+
thresholds:
1508+
- priority: DEFAULT
1509+
max_connections: 30000
1510+
max_requests: 8192
1511+
max_retries: 3
1512+
- priority: HIGH
1513+
max_connections: 30000
1514+
max_requests: 8192
1515+
max_retries: 3
1516+
load_assignment:
1517+
cluster_name: httpd-quarantined-media-changes
1518+
endpoints:
1519+
- lb_endpoints:
1520+
- endpoint:
1521+
address:
1522+
socket_address:
1523+
address: synapse-quarantined-media-changes-headless
1524+
port_value: 8008
14981525
14991526
synapse.lua: |
15001527
local room_id_pattern = "(![A-Za-z0-9._=%%%-/]+:[A-Za-z0-9.%-]+)"

0 commit comments

Comments
 (0)