From 003aa144ac96fb05737c6e4d4dbff5e8355d8d9e Mon Sep 17 00:00:00 2001
From: Alex Babel <alexander.babel@icloud.com>
Date: Sun, 21 Nov 2021 00:40:03 +0100
Subject: [PATCH 1/3] fix(matrix-synapse/service): fix typo (serviceport ->
 service.port)

---
 charts/matrix-synapse/templates/service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/matrix-synapse/templates/service.yaml b/charts/matrix-synapse/templates/service.yaml
index 94e5dfa..a2cecd8 100644
--- a/charts/matrix-synapse/templates/service.yaml
+++ b/charts/matrix-synapse/templates/service.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.serviceport | default 8008 }}
+    - port: {{ .Values.service.port | default 8008 }}
       targetPort: {{ .Values.service.targetPort | default "http" }}
       protocol: TCP
       name: http

From c99918b413d7c9e4a2250534dec245e1193e6343 Mon Sep 17 00:00:00 2001
From: Alex Babel <alexander.babel@icloud.com>
Date: Sun, 21 Nov 2021 00:48:21 +0100
Subject: [PATCH 2/3] fix(matrix-synapse): replace 8008 with port variable

---
 charts/matrix-synapse/templates/ingress.yaml         | 12 ++++++------
 .../templates/tests/test-connection.yaml             |  2 +-
 .../templates/worker-configuration.yaml              |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml
index 6797149..8e8ebe4 100644
--- a/charts/matrix-synapse/templates/ingress.yaml
+++ b/charts/matrix-synapse/templates/ingress.yaml
@@ -139,11 +139,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Prefix
           {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
           {{- end }}
         {{- end }}
 
@@ -154,11 +154,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Prefix
           {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
           {{- end }}
         {{- end }}
 
@@ -195,11 +195,11 @@ spec:
               service:
                 name: {{ $fullName }}
                 port:
-                  number: 8008
+                  number: {{ $.Values.service.port }}
             pathType: Exact
             {{- else }}
               serviceName: {{ $fullName }}
-              servicePort: 8008
+              servicePort: {{ $.Values.service.port }}
             {{- end }}
           {{- end }}
         {{- end }}
diff --git a/charts/matrix-synapse/templates/tests/test-connection.yaml b/charts/matrix-synapse/templates/tests/test-connection.yaml
index b53f310..466e954 100644
--- a/charts/matrix-synapse/templates/tests/test-connection.yaml
+++ b/charts/matrix-synapse/templates/tests/test-connection.yaml
@@ -12,5 +12,5 @@ spec:
     - name: wget
       image: busybox
       command: ['wget']
-      args:  ['{{ include "matrix-synapse.fullname" . }}:8008/_matrix/client/versions']
+      args:  ['{{ include "matrix-synapse.fullname" . }}:{{ $.Values.service.port }}/_matrix/client/versions']
   restartPolicy: Never
diff --git a/charts/matrix-synapse/templates/worker-configuration.yaml b/charts/matrix-synapse/templates/worker-configuration.yaml
index accc7b9..e0067fa 100644
--- a/charts/matrix-synapse/templates/worker-configuration.yaml
+++ b/charts/matrix-synapse/templates/worker-configuration.yaml
@@ -29,7 +29,7 @@ data:
     worker_name: {{ $config.name }}
 {{- end }}
 
-    worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:8008
+    worker_main_http_uri: http://{{ include "matrix-synapse.fullname" $ }}:{{ $.Values.service.port }}
     worker_replication_host: {{ include "matrix-synapse.replicationname" $ | quote }}
     worker_replication_http_port: 9093
 

From 23262ca5ffa1845972d8aab08869a5845ced20db Mon Sep 17 00:00:00 2001
From: Alex Babel <alexander.babel@icloud.com>
Date: Tue, 30 Nov 2021 18:24:01 +0000
Subject: [PATCH 3/3] fix(templates/service): remove default for service.port

---
 charts/matrix-synapse/templates/service.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/matrix-synapse/templates/service.yaml b/charts/matrix-synapse/templates/service.yaml
index a2cecd8..87af993 100644
--- a/charts/matrix-synapse/templates/service.yaml
+++ b/charts/matrix-synapse/templates/service.yaml
@@ -8,7 +8,7 @@ metadata:
 spec:
   type: ClusterIP
   ports:
-    - port: {{ .Values.service.port | default 8008 }}
+    - port: {{ .Values.service.port }}
       targetPort: {{ .Values.service.targetPort | default "http" }}
       protocol: TCP
       name: http