From 4e67ed133e1f3009a579963784373a2c1d895c30 Mon Sep 17 00:00:00 2001
From: WrenIX <dev@wrenix.eu>
Date: Fri, 23 Aug 2024 19:09:49 +0200
Subject: [PATCH] -a(matrix-synapse): support well-known for element

---
 matrix-synapse/Chart.yaml                          |  2 +-
 matrix-synapse/README.adoc                         |  7 ++++++-
 matrix-synapse/templates/ingress.yaml              | 12 ++++++++++++
 matrix-synapse/templates/wellknown/configmap.yaml  |  4 +++-
 matrix-synapse/templates/wellknown/deployment.yaml |  3 +++
 matrix-synapse/values.yaml                         |  4 ++++
 6 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/matrix-synapse/Chart.yaml b/matrix-synapse/Chart.yaml
index 57b1229..ace2cc5 100644
--- a/matrix-synapse/Chart.yaml
+++ b/matrix-synapse/Chart.yaml
@@ -4,7 +4,7 @@ name: matrix-synapse
 description: Matrix reference homeserver
 icon: https://matrix.org/images/matrix-logo.svg
 type: application
-version: 0.2.8
+version: 0.3.0
 # renovate: image=ghcr.io/element-hq/synapse
 appVersion: 1.101.0
 maintainers:
diff --git a/matrix-synapse/README.adoc b/matrix-synapse/README.adoc
index 760e03f..d14171f 100644
--- a/matrix-synapse/README.adoc
+++ b/matrix-synapse/README.adoc
@@ -2,7 +2,7 @@
 
 = matrix-synapse
 
-image::https://img.shields.io/badge/Version-0.2.8-informational?style=flat-square[Version: 0.2.8]
+image::https://img.shields.io/badge/Version-0.3.0-informational?style=flat-square[Version: 0.3.0]
 image::https://img.shields.io/badge/Version-application-informational?style=flat-square[Type: application]
 image::https://img.shields.io/badge/AppVersion-1.101.0-informational?style=flat-square[AppVersion: 1.101.0]
 == Maintainers
@@ -597,6 +597,11 @@ helm uninstall matrix-synapse-release
 | `80`
 |
 
+| wellknown.element
+| object
+| `{}`
+| Data to serve on .well-known/element/element.json  call:    widget_url: https://call.element.io
+
 | wellknown.enabled
 | bool
 | `false`
diff --git a/matrix-synapse/templates/ingress.yaml b/matrix-synapse/templates/ingress.yaml
index 8ec00ea..b23731f 100644
--- a/matrix-synapse/templates/ingress.yaml
+++ b/matrix-synapse/templates/ingress.yaml
@@ -176,6 +176,18 @@ spec:
               serviceName: {{ $wkName }}
               servicePort: {{ $.Values.wellknown.service.port | default 80 }}
             {{- end }}
+          - path: /.well-known/element
+            backend:
+            {{- if $v1Ingress }}
+              service:
+                name: {{ $wkName }}
+                port:
+                  number: {{ $.Values.wellknown.service.port | default 80 }}
+            pathType: Prefix
+            {{- else }}
+              serviceName: {{ $wkName }}
+              servicePort: {{ $.Values.wellknown.service.port | default 80 }}
+            {{- end }}
           {{-   else }}
           - path: /.well-known/matrix
             backend:
diff --git a/matrix-synapse/templates/wellknown/configmap.yaml b/matrix-synapse/templates/wellknown/configmap.yaml
index a8d1e76..beb5158 100644
--- a/matrix-synapse/templates/wellknown/configmap.yaml
+++ b/matrix-synapse/templates/wellknown/configmap.yaml
@@ -20,5 +20,7 @@ data:
     {{- else }}
     {{- dict "m.homeserver" (dict "base_url" (printf "https://%s/" (.Values.publicServerName | default .Values.serverName))) | toJson | nindent 4 }}
     {{- end }}
-  {{- (.Files.Glob "files/well-known/*" ).AsConfig | nindent 2 }}
+  element.json: |-
+    {{- toJson .Values.wellknown.element | nindent 4 }}
+  {{- (.Files.Glob "files/well-known/nginx.conf" ).AsConfig | nindent 2 }}
 {{- end -}}{{/* end-if .wellknown.enabled */}}
diff --git a/matrix-synapse/templates/wellknown/deployment.yaml b/matrix-synapse/templates/wellknown/deployment.yaml
index 7c3dc27..de2ef39 100644
--- a/matrix-synapse/templates/wellknown/deployment.yaml
+++ b/matrix-synapse/templates/wellknown/deployment.yaml
@@ -60,6 +60,9 @@ spec:
             - name: "data"
               mountPath: "/usr/share/nginx/html/.well-known/matrix/server"
               subPath: "server"
+            - name: "data"
+              mountPath: "/usr/share/nginx/html/.well-known/element/element.json"
+              subPath: "element.json"
             - name: "data"
               mountPath: "/etc/nginx/conf.d/default.conf"
               subPath: "nginx.conf"
diff --git a/matrix-synapse/values.yaml b/matrix-synapse/values.yaml
index 8652644..457e331 100644
--- a/matrix-synapse/values.yaml
+++ b/matrix-synapse/values.yaml
@@ -641,6 +641,10 @@ wellknown:
   #  m.homeserver:
   #    base_url: https://matrix.example.com
   client: {}
+  # -- Data to serve on .well-known/element/element.json
+  #  call:
+  #    widget_url: https://call.element.io
+  element: {}
 
 ## This configuration is for setting up the internally provided Postgres server,
 ## if you instead want to use an existing server, then you may want to set