Skip to content

devoce-lists user-hash lb #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
shcherbak wants to merge 1 commit into
base: main
Choose a base branch
from
Open

devoce-lists user-hash lb #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion charts/synapse/Chart.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ apiVersion: v2
appVersion: 1.151.0
description: matrix synapse kubernetes deployment
name: synapse
version: 2.4.6
version: 2.5.0
8 changes: 8 additions & 0 deletions charts/synapse/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,14 @@ app: synapse
component: synapse-federation-reader
{{- end }}

{{/*
Selector labels
*/}}
{{- define "synapse-device-lists.selectorLabels" -}}
app: synapse
component: synapse-device-lists
{{- end }}

{{/*
Selector labels
*/}}
Expand Down
13 changes: 9 additions & 4 deletions charts/synapse/templates/envoy-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,6 +219,13 @@ data:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
{{- end }}

{{- range $route := .Values.ingress.pushRulesRoutes }}
Expand Down Expand Up @@ -711,9 +718,7 @@ data:
type: STRICT_DNS
dns_lookup_family: V4_ONLY
ignore_health_on_host_removal: true
lb_policy: LEAST_REQUEST
least_request_lb_config:
choice_count: 2
lb_policy: RING_HASH
circuit_breakers:
thresholds:
- priority: DEFAULT
Expand All @@ -731,7 +736,7 @@ data:
- endpoint:
address:
socket_address:
address: synapse-device-lists
address: synapse-device-lists-headless
port_value: 8008
{{- if .Values.experimentalFeatures.msc4306.enabled }}
- name: httpd-thread-subscriptions
Expand Down
20 changes: 20 additions & 0 deletions charts/synapse/templates/synapse-service.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,23 @@ spec:
targetPort: 8008
selector:
{{- include "synapse-federation-reader.selectorLabels" . | nindent 6 }}
---
apiVersion: v1
kind: Service
metadata:
name: synapse-device-lists-headless
{{- with $.Values.synapse.service.annotations }}
annotations:
{{- toYaml . | nindent 4 }}
{{- end }}
labels:
{{- include "synapse-device-lists.selectorLabels" . | nindent 4 }}
spec:
clusterIP: None
type: ClusterIP
ports:
- name: http
port: 8008
targetPort: 8008
selector:
{{- include "synapse-device-lists.selectorLabels" . | nindent 6 }}
79 changes: 58 additions & 21 deletions charts/synapse/tests/golden/fixtures/test-envoy-configmap-msc4306.golden.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,34 +326,83 @@ data:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/devices(/.*)?$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/keys/upload$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(v3|unstable)/keys/device_signing/upload$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/keys/signatures/upload$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/keys/query$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-device-lists
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: whoami_hash
- match:
safe_regex:
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/pushrules/.*'
Expand Down Expand Up @@ -602,16 +651,6 @@ data:
hash_policy:
- connection_properties:
source_ip: true
- match:
safe_regex:
regex: '^/_matrix/client/unstable/org.matrix.msc4140/delayed_events(/.*/restart)?$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-federation-ip-hash
hash_policy:
- connection_properties:
source_ip: true
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/user_directory/search$'
Expand Down Expand Up @@ -661,13 +700,6 @@ data:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-client-reader
- match:
safe_regex:
regex: '^/_matrix/client/(r0|v3|unstable)/keys/query$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-client-reader
- match:
safe_regex:
regex: '^/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact/.*'
Expand Down Expand Up @@ -885,6 +917,13 @@ data:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-client-reader
- match:
safe_regex:
regex: '^/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events(/.*/restart)?$'
route:
timeout: 300s
auto_host_rewrite: true
cluster: httpd-client-reader
- match:
safe_regex:
regex: '^/_matrix/.*'
Expand Down Expand Up @@ -1278,9 +1317,7 @@ data:
type: STRICT_DNS
dns_lookup_family: V4_ONLY
ignore_health_on_host_removal: true
lb_policy: LEAST_REQUEST
least_request_lb_config:
choice_count: 2
lb_policy: RING_HASH
circuit_breakers:
thresholds:
- priority: DEFAULT
Expand All @@ -1298,7 +1335,7 @@ data:
- endpoint:
address:
socket_address:
address: synapse-device-lists
address: synapse-device-lists-headless
port_value: 8008
- name: httpd-thread-subscriptions
connect_timeout: 0.02s
Expand Down
Loading