keys/query

Author: shcherbak

charts/synapse/Chart.yaml

@@ -2,4 +2,4 @@ apiVersion: v2
 appVersion: 1.151.0
 description: matrix synapse kubernetes deployment
 name: synapse
-version: 2.4.5
+version: 2.4.6

charts/synapse/templates/envoy-configmap.yaml

@@ -102,6 +102,18 @@ data:
                                 cluster: httpd-master
                             {{- end }}
 
+                            {{- if not .Values.matrixAuthentication.enabled }}
+                            {{- range $route := .Values.ingress.clientReaderRegister }}
+                            - match:
+                                safe_regex:
+                                  regex: {{ printf "^%s" $route | squote }}
+                              route:
+                                timeout: 300s
+                                auto_host_rewrite: true
+                                cluster: httpd-client-reader
+                            {{- end }}
+                            {{- end }}
+
                             {{- range $route := .Values.ingress.receipts }}
                             - match:
                                 safe_regex:
@@ -269,17 +281,6 @@ data:
                                 cluster: httpd-user-dir
                             {{- end }}
 
-                            {{- if not .Values.matrixAuthentication.enabled }}
-                            {{- range $route := .Values.ingress.clientReaderRegister }}
-                            - match:
-                                safe_regex:
-                                  regex: {{ printf "^%s" $route | squote }}
-                              route:
-                                timeout: 300s
-                                auto_host_rewrite: true
-                                cluster: httpd-client-reader
-                            {{- end }}
-                            {{- end }}
                             {{- if .Values.matrixAuthentication.enabled }}
                             {{- range $route := .Values.ingress.matrixAuthentication }}
                             - match:

charts/synapse/values.yaml

@@ -406,6 +406,8 @@ ingress:
     - '/_matrix/client/(v3|unstable)/keys/device_signing/upload$'
     # workers.md: ^/_matrix/client/(api/v1|r0|v3|unstable)/keys/signatures/upload$
     - '/_matrix/client/(r0|v3|unstable)/keys/signatures/upload$'
+    # moved from client reader
+    - '/_matrix/client/(r0|v3|unstable)/keys/query$'
 
   # validated 020626
   threadSubscriptionsRoutes:
@@ -455,7 +457,8 @@ ingress:
   clientReaderRoomKeys:
     - '/_matrix/client/(r0|v3|unstable)/keys/changes$'
     - '/_matrix/client/(r0|v3|unstable)/keys/claim$'
-    - '/_matrix/client/(r0|v3|unstable)/keys/query$'
+  # moved to deviceListsRoutes
+  #  - '/_matrix/client/(r0|v3|unstable)/keys/query$'
 
   # by round-robin
   clientReaderRoutes:
@@ -483,6 +486,9 @@ ingress:
     - '/_matrix/client/(api/v1|r0|v3|unstable)/directory/room/.*$'
     - '/_matrix/client/(r0|v3|unstable)/capabilities$'
     - '/_matrix/client/(r0|v3|unstable)/notifications$'
+    - '/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events(/.*/restart)?$'
+    # check acc to delayed_events.py
+    #- '/_matrix/client/unstable/org\.matrix\.msc4140/delayed_events.*'
 
   clientReaderRegister:
     - "/_matrix/client/(api/v1|r0|v3|unstable)/login$"
@@ -514,7 +520,6 @@ ingress:
     - "/_matrix/key/v2/query.*"
     - "/_matrix/federation/v1/hierarchy/.*"
     - "/_matrix/federation/v1/send/.*"
-    - "/_matrix/client/unstable/org.matrix.msc4140/delayed_events(/.*/restart)?$"
 
   matrixAuthentication:
     - "/_matrix/client/(api/v1|r0|v3|unstable)/login/sso/redirect(/.*)?$"