Merge branch 'template-update' into 'master'

matrix-synapse - Add option to modify wellknown service

See merge request ananace/charts!48

charts/matrix-synapse/templates/ingress.yaml

@@ -170,11 +170,11 @@ spec:
               service:
                 name: {{ $wkName }}
                 port:
-                  number: 80
+                  number: {{ $.Values.wellknown.service.port | default 80 }}
             pathType: Prefix
             {{- else }}
               serviceName: {{ $wkName }}
-              servicePort: 80
+              servicePort: {{ $.Values.wellknown.service.port | default 80 }}
             {{- end }}
           {{-   else }}
           - path: /.well-known/matrix

charts/matrix-synapse/templates/well-known.yaml

@@ -9,9 +9,9 @@ metadata:
     {{- include "matrix-synapse.labels" . | nindent 4 }}
     app.kubernetes.io/component: well-known
 spec:
-  type: ClusterIP
+  type: {{ .Values.wellknown.service.type | default "ClusterIP" }}
   ports:
-    - port: 80
+    - port: {{ .Values.wellknown.service.port | default 80 }}
       targetPort: http
       protocol: TCP
       name: http

charts/matrix-synapse/values.yaml

@@ -606,6 +606,12 @@ wellknown:
   #  m.homeserver:
   #    base_url: https://matrix.example.com
 
+  ## Configuration for the wellknown service.
+  ##
+  service:
+    type: ClusterIP
+    port: 80
+
   ## Extra data objects to serve under .well-known/matrix/<data>
   ## Dictionaries will be JSON converted, plain strings will be served as they are
   ##