pub/charts
1
0
Fork 0
Code Issues Pull requests Releases Packages 19 Activity Actions

matrix-synapse: Use anchors on worker paths

Browse source 
The Nginx ingress seems to handle these correctly now, so use them where
possible.
This commit is contained in:
Alexander "Ace" Olofsson 2022-07-25 11:24:08 +02:00
parent 30a0f880a2
commit ac8d2652c9
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
3 changed files with 54 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
charts/matrix-synapse/Chart.yaml
View file

@ -6,7 +6,7 @@ icon: https://matrix.org/images/matrix-logo.svg
appVersion: 1.63.1 appVersion: 1.63.1
type: application type: application
version: 2.4.0 version: 2.5.0
maintainers: maintainers:
- name: Alexander Olofsson - name: Alexander Olofsson
email: ace@haxalot.com email: ace@haxalot.com

8
charts/matrix-synapse/templates/ingress.yaml
View file

@ -66,7 +66,7 @@ spec:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
pathType: Exact pathType: ImplementationSpecific
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -79,7 +79,7 @@ spec:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
pathType: Exact pathType: ImplementationSpecific
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -97,7 +97,7 @@ spec:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
pathType: Exact pathType: ImplementationSpecific
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
@ -110,7 +110,7 @@ spec:
name: {{ $service }} name: {{ $service }}
port: port:
number: 8083 number: 8083
pathType: Exact pathType: ImplementationSpecific
{{- else }} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083

98
charts/matrix-synapse/values.yaml
View file

@ -393,48 +393,48 @@ workers:
listeners: [client, federation] listeners: [client, federation]
csPaths: csPaths:
## Sync requests ## Sync requests
# - "/_matrix/client/(r0|v3)/sync" # - "/_matrix/client/(r0|v3)/sync$"
- "/_matrix/client/(api/v1|r0|v3)/events" - "/_matrix/client/(api/v1|r0|v3)/events$"
# - "/_matrix/client/(api/v1|r0|v3)/initialSync" # - "/_matrix/client/(api/v1|r0|v3)/initialSync$"
# - "/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync" # - "/_matrix/client/(api/v1|r0|v3)/rooms/[^/]+/initialSync$"
## Client API requests ## Client API requests
- "/_matrix/client/(api/v1|r0|v3|unstable)/createRoom" - "/_matrix/client/(api/v1|r0|v3|unstable)/createRoom$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/publicRooms" - "/_matrix/client/(api/v1|r0|v3|unstable)/publicRooms$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/joined_members" - "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/joined_members$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/context/.*" - "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/context/"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members" - "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/members$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state" - "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state$"
- "/_matrix/client/v1/rooms/.*/hierarchy" - "/_matrix/client/v1/rooms/.*/hierarchy$"
- "/_matrix/client/unstable/org.matrix.msc2716/rooms/.*/batch_send" - "/_matrix/client/unstable/org.matrix.msc2716/rooms/.*/batch_send$"
- "/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary" - "/_matrix/client/unstable/im.nheko.summary/rooms/.*/summary$"
- "/_matrix/client/(r0|v3|unstable)/account/3pid" - "/_matrix/client/(r0|v3|unstable)/account/3pid$"
- "/_matrix/client/(r0|v3|unstable)/account/whoami" - "/_matrix/client/(r0|v3|unstable)/account/whoami$"
- "/_matrix/client/(r0|v3|unstable)/devices" - "/_matrix/client/(r0|v3|unstable)/devices$"
- "/_matrix/client/versions" - "/_matrix/client/versions$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer" - "/_matrix/client/(api/v1|r0|v3|unstable)/voip/turnServer$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/.*" - "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/event/"
- "/_matrix/client/(api/v1|r0|v3|unstable)/joined_rooms" - "/_matrix/client/(api/v1|r0|v3|unstable)/joined_rooms$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/search" - "/_matrix/client/(api/v1|r0|v3|unstable)/search$"
## Encryption requests ## Encryption requests
- "/_matrix/client/(r0|v3|unstable)/keys/query" - "/_matrix/client/(r0|v3|unstable)/keys/query$"
- "/_matrix/client/(r0|v3|unstable)/keys/changes" - "/_matrix/client/(r0|v3|unstable)/keys/changes$"
- "/_matrix/client/(r0|v3|unstable)/keys/claim" - "/_matrix/client/(r0|v3|unstable)/keys/claim$"
- "/_matrix/client/(r0|v3|unstable)/room_keys/.*" - "/_matrix/client/(r0|v3|unstable)/room_keys/"
## Registration/login requests ## Registration/login requests
- "/_matrix/client/(api/v1|r0|v3|unstable)/login" - "/_matrix/client/(api/v1|r0|v3|unstable)/login$"
- "/_matrix/client/(r0|v3|unstable)/register" - "/_matrix/client/(r0|v3|unstable)/register$"
- "/_matrix/client/v1/register/m.login.registration_token/validity" - "/_matrix/client/v1/register/m.login.registration_token/validity$"
## Event sending requests ## Event sending requests
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/redact" - "/_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/.*/send"
- "/_matrix/client/(api/v1|r0|v3|unstable)/rooms/.*/state/.*" - "/_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)/rooms/.*/(join|invite|leave|ban|unban|kick)$"
- "/_matrix/client/(api/v1|r0|v3|unstable)/join/.*" - "/_matrix/client/(api/v1|r0|v3|unstable)/join/"
- "/_matrix/client/(api/v1|r0|v3|unstable)/profile/.*" - "/_matrix/client/(api/v1|r0|v3|unstable)/profile/"
## Account data requests ## Account data requests
- "/_matrix/client/(r0|v3|unstable)/.*/tags" - "/_matrix/client/(r0|v3|unstable)/.*/tags"
@ -445,33 +445,33 @@ workers:
- "/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers" - "/_matrix/client/(r0|v3|unstable)/rooms/.*/read_markers"
## Presence requests ## Presence requests
- "/_matrix/client/(api/v1|r0|v3|unstable)/presence/.*" - "/_matrix/client/(api/v1|r0|v3|unstable)/presence/"
## User directory search requests ## User directory search requests
- "/_matrix/client/(r0|v3|unstable)/user_directory/search" - "/_matrix/client/(r0|v3|unstable)/user_directory/search"
paths: paths:
## Federation requests ## Federation requests
- "/_matrix/federation/v1/event/.*" - "/_matrix/federation/v1/event/"
- "/_matrix/federation/v1/state/.*" - "/_matrix/federation/v1/state/"
- "/_matrix/federation/v1/state_ids/.*" - "/_matrix/federation/v1/state_ids/"
- "/_matrix/federation/v1/backfill/.*" - "/_matrix/federation/v1/backfill/"
- "/_matrix/federation/v1/get_missing_events/.*" - "/_matrix/federation/v1/get_missing_events/"
- "/_matrix/federation/v1/publicRooms" - "/_matrix/federation/v1/publicRooms"
- "/_matrix/federation/v1/query/.*" - "/_matrix/federation/v1/query/"
- "/_matrix/federation/v1/make_join/.*" - "/_matrix/federation/v1/make_join/"
- "/_matrix/federation/v1/make_leave/.*" - "/_matrix/federation/v1/make_leave/"
- "/_matrix/federation/(v1|v2)/send_join/.*" - "/_matrix/federation/(v1|v2)/send_join/"
- "/_matrix/federation/(v1|v2)/send_leave/.*" - "/_matrix/federation/(v1|v2)/send_leave/"
- "/_matrix/federation/(v1|v2)/invite/.*" - "/_matrix/federation/(v1|v2)/invite/"
- "/_matrix/federation/v1/event_auth/.*" - "/_matrix/federation/v1/event_auth/"
- "/_matrix/federation/v1/exchange_third_party_invite/.*" - "/_matrix/federation/v1/exchange_third_party_invite/"
- "/_matrix/federation/v1/user/devices/.*" - "/_matrix/federation/v1/user/devices/"
- "/_matrix/key/v2/query" - "/_matrix/key/v2/query"
- "/_matrix/federation/v1/hierarchy/.*" - "/_matrix/federation/v1/hierarchy/"
## Inbound federation transaction request ## Inbound federation transaction request
- "/_matrix/federation/v1/send/.*" - "/_matrix/federation/v1/send/"
## To separate the generic worker into specific concerns - for example federation transaction receiving; ## To separate the generic worker into specific concerns - for example federation transaction receiving;
## NB; This worker should have incoming traffic routed based on source IP, which is ## NB; This worker should have incoming traffic routed based on source IP, which is