Skip to content

Commit 4608ea3

Browse files
shcherbakshcherbak
authored
Replace ingress (#30)
* ingress * envoy * envoy-for-all * envoy-replaces-ingress
1 parent 4087862 commit 4608ea3

22 files changed

Lines changed: 1397 additions & 1953 deletions

‎charts/synapse/Chart.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
apiVersion: v2
33
name: synapse
44
description: matrix synapse kubernetes deployment
5-
version: 2.3.8
5+
version: 3.0.0
66
appVersion: 1.151.0

‎charts/synapse/scripts/envoy.yaml‎

Lines changed: 0 additions & 514 deletions
This file was deleted.

‎charts/synapse/templates/admin-deployment.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,7 @@ metadata:
88
spec:
99
replicas: {{ .Values.admin.replicas }}
1010
{{- if .Values.admin.updateStrategy }}
11-
strategy:
12-
{{ toYaml .Values.admin.updateStrategy | nindent 6 }}
11+
strategy: {{ toYaml .Values.admin.updateStrategy | nindent 6 }}
1312
{{- end }}
1413
selector:
1514
matchLabels:

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

Lines changed: 784 additions & 1 deletion
Large diffs are not rendered by default.

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,7 @@ spec:
1010
matchLabels:
1111
{{- include "synapse-client-reader-envoy.selectorLabels" . | nindent 6 }}
1212
{{- if .Values.envoyProxy.updateStrategy }}
13-
strategy:
14-
{{ toYaml .Values.envoyProxy.updateStrategy | nindent 4 }}
13+
strategy: {{ toYaml .Values.envoyProxy.updateStrategy | nindent 4 }}
1514
{{- end }}
1615
template:
1716
metadata:

‎charts/synapse/templates/matrix-authentication-deployment.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@ spec:
1313
matchLabels:
1414
{{- include "matrix-authentication.selectorLabels" . | nindent 6 }}
1515
{{- if .Values.matrixAuthentication.updateStrategy }}
16-
strategy:
17-
{{ toYaml .Values.matrixAuthentication.updateStrategy | nindent 4 }}
16+
strategy: {{ toYaml .Values.matrixAuthentication.updateStrategy | nindent 4 }}
1817
{{- end }}
1918
template:
2019
metadata:

‎charts/synapse/templates/pgbouncer-deployment.yaml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ spec:
1111
matchLabels:
1212
app: synapse-pgbouncer
1313
{{- if .Values.synapse.pgbouncer.updateStrategy }}
14-
strategy:
15-
{{ toYaml .Values.synapse.pgbouncer.updateStrategy | nindent 4 }}
14+
strategy: {{ toYaml .Values.synapse.pgbouncer.updateStrategy | nindent 4 }}
1615
{{- end }}
1716
template:
1817
metadata:

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

Lines changed: 2 additions & 174 deletions
Original file line numberDiff line numberDiff line change
@@ -21,182 +21,10 @@ spec:
2121
- host: {{ .Values.synapse.serverName }}
2222
http:
2323
paths:
24-
{{- range $route := .Values.ingress.masterOverridesRoutes }}
25-
- path: {{ $route }}
26-
pathType: ImplementationSpecific
27-
backend:
28-
service:
29-
port:
30-
number: 80
31-
name: synapse-master
32-
{{- end }}
33-
{{- range $route := .Values.ingress.roomFederationRoutes }}
34-
- path: {{ $route }}
35-
pathType: ImplementationSpecific
24+
- path: /
25+
pathType: Prefix
3626
backend:
3727
service:
3828
port:
3929
number: 80
4030
name: synapse-client-reader-envoy
41-
{{- end }}
42-
{{- range $route := .Values.ingress.typing }}
43-
- path: {{ $route }}
44-
pathType: ImplementationSpecific
45-
backend:
46-
service:
47-
port:
48-
number: 80
49-
name: synapse-typing
50-
{{- end }}
51-
{{- range $route := .Values.ingress.toDevice }}
52-
- path: {{ $route }}
53-
pathType: ImplementationSpecific
54-
backend:
55-
service:
56-
port:
57-
number: 80
58-
name: synapse-to-device
59-
{{- end }}
60-
{{- range $route := .Values.ingress.accountData }}
61-
- path: {{ $route }}
62-
pathType: ImplementationSpecific
63-
backend:
64-
service:
65-
port:
66-
number: 80
67-
name: synapse-account-data
68-
{{- end }}
69-
{{- range $route := .Values.ingress.receipts }}
70-
- path: {{ $route }}
71-
pathType: ImplementationSpecific
72-
backend:
73-
service:
74-
port:
75-
number: 80
76-
name: synapse-receipts
77-
{{- end }}
78-
{{- range $route := .Values.ingress.presence }}
79-
- path: {{ $route }}
80-
pathType: ImplementationSpecific
81-
backend:
82-
service:
83-
port:
84-
number: 80
85-
name: synapse-presence
86-
{{- end }}
87-
{{- range $route := .Values.ingress.pushRulesRoutes }}
88-
- path: {{ $route }}
89-
pathType: ImplementationSpecific
90-
backend:
91-
service:
92-
port:
93-
number: 80
94-
name: synapse-push-rules
95-
{{- end }}
96-
{{- range $route := .Values.ingress.deviceListsRoutes }}
97-
- path: {{ $route }}
98-
pathType: ImplementationSpecific
99-
backend:
100-
service:
101-
port:
102-
number: 80
103-
name: synapse-device-lists
104-
{{- end }}
105-
{{- if .Values.experimentalFeatures.msc4306.enabled }}
106-
{{- range $route := .Values.ingress.threadSubscriptionsRoutes }}
107-
- path: {{ $route }}
108-
pathType: ImplementationSpecific
109-
backend:
110-
service:
111-
port:
112-
number: 80
113-
name: synapse-thread-subscriptions
114-
{{- end }}
115-
{{- end }}
116-
{{- range $route := .Values.ingress.roomRoutes }}
117-
- path: {{ $route }}
118-
pathType: ImplementationSpecific
119-
backend:
120-
service:
121-
port:
122-
number: 80
123-
# !
124-
name: synapse-client-reader-envoy
125-
{{- end }}
126-
{{- range $route := .Values.ingress.syncRoutes }}
127-
- path: {{ $route }}
128-
pathType: ImplementationSpecific
129-
backend:
130-
service:
131-
port:
132-
number: 80
133-
# !
134-
name: synapse-client-reader-envoy
135-
{{- end }}
136-
{{- range $route := .Values.ingress.clientReaderRoutes }}
137-
- path: {{ $route }}
138-
pathType: ImplementationSpecific
139-
backend:
140-
service:
141-
port:
142-
number: 80
143-
name: synapse-client-reader-envoy
144-
{{- end }}
145-
{{- if not .Values.matrixAuthentication.enabled }}
146-
{{- range $route := .Values.ingress.clientReaderRegister }}
147-
- path: {{ $route }}
148-
pathType: ImplementationSpecific
149-
backend:
150-
service:
151-
port:
152-
number: 80
153-
name: synapse-client-reader-envoy
154-
{{- end }}
155-
{{- end }}
156-
{{- range $route := .Values.ingress.federationReaderRoutes }}
157-
- path: {{ $route }}
158-
pathType: ImplementationSpecific
159-
backend:
160-
service:
161-
port:
162-
number: 80
163-
name: synapse-client-reader-envoy
164-
{{- end }}
165-
{{- if .Values.matrixAuthentication.enabled }}
166-
{{- range $route := .Values.ingress.matrixAuthentication }}
167-
- path: {{ $route }}
168-
pathType: ImplementationSpecific
169-
backend:
170-
service:
171-
port:
172-
number: 80
173-
name: matrix-authentication
174-
{{- end }}
175-
{{- end }}
176-
{{- range $route := .Values.ingress.userDirectoryRoutes }}
177-
- path: {{ $route }}
178-
pathType: ImplementationSpecific
179-
backend:
180-
service:
181-
port:
182-
number: 80
183-
name: synapse-user-dir
184-
{{- end }}
185-
{{- range $route := .Values.ingress.mediaRepository }}
186-
- path: {{ $route }}
187-
pathType: ImplementationSpecific
188-
backend:
189-
service:
190-
port:
191-
number: 80
192-
name: synapse-media-repository
193-
{{- end }}
194-
{{- range $route := .Values.ingress.masterRoutes }}
195-
- path: {{ $route }}
196-
pathType: ImplementationSpecific
197-
backend:
198-
service:
199-
port:
200-
number: 80
201-
name: synapse-master
202-
{{- end }}

‎charts/synapse/templates/synapse-workers-deployment.yaml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@ spec:
1515
replicas: {{ $options.replicas }}
1616
{{- end }}
1717
{{- if $.Values.synapse.updateStrategy }}
18-
strategy:
19-
{{ toYaml $.Values.synapse.updateStrategy | nindent 4 }}
18+
strategy: {{ toYaml $.Values.synapse.updateStrategy | nindent 4 }}
2019
{{- end }}
2120
selector:
2221
matchLabels:
@@ -31,5 +30,5 @@ spec:
3130
{{- end }}
3231
{{- include "synapse-workers.selectorLabels" $name | nindent 8 }}
3332
spec:
34-
{{ include "synapse-workers.containers" (dict "name" $name "image" $.Values.synapse.image "worker" $worker "options" $options "resourcesDefaults" $.Values.synapse.resourcesDefaults "nodeSelector" $.Values.synapse.nodeSelector "tolerations" $.Values.synapse.tolerations "affinity" $.Values.synapse.affinity) | nindent 6 }}
33+
{{- include "synapse-workers.containers" (dict "name" $name "image" $.Values.synapse.image "worker" $worker "options" $options "resourcesDefaults" $.Values.synapse.resourcesDefaults "nodeSelector" $.Values.synapse.nodeSelector "tolerations" $.Values.synapse.tolerations "affinity" $.Values.synapse.affinity) | nindent 6 }}
3534
{{ end }}

‎charts/synapse/templates/synapse-workers-statefulset.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@ spec:
2727
{{- end }}
2828
{{- include "synapse-workers.selectorLabels" $name | nindent 8 }}
2929
spec:
30-
{{ include "synapse-workers.containers" (dict "name" $name "image" $.Values.synapse.image "worker" $worker "options" $options "resourcesDefaults" $.Values.synapse.resourcesDefaults "nodeSelector" $.Values.synapse.nodeSelector "tolerations" $.Values.synapse.tolerations "affinity" $.Values.synapse.affinity) | nindent 6 }}
30+
{{- include "synapse-workers.containers" (dict "name" $name "image" $.Values.synapse.image "worker" $worker "options" $options "resourcesDefaults" $.Values.synapse.resourcesDefaults "nodeSelector" $.Values.synapse.nodeSelector "tolerations" $.Values.synapse.tolerations "affinity" $.Values.synapse.affinity) | nindent 6 }}
3131
{{ end }}

0 commit comments

Comments
 (0)