Remove ingress.host from Well-Known Delegation

Author: benbz

charts/matrix-stack/source/common/ingress_without_host.json

@@ -0,0 +1,42 @@
+{
+  "type": "object",
+  "properties": {
+    "annotations": {
+      "type": "object",
+      "additionalProperties": {
+        "type": [
+          "string",
+          "null"
+        ]
+      }
+    },
+    "className": {
+      "type": "string"
+    },
+    "tlsEnabled": {
+      "type": "boolean"
+    },
+    "tlsSecret": {
+      "type": "string"
+    },
+    "controllerType": {
+      "type": "string",
+      "enum": [
+        "ingress-nginx"
+      ]
+    },
+    "service": {
+      "type": "object",
+      "properties": {
+        "type": {
+          "type": "string",
+          "enum": [
+            "ClusterIP",
+            "NodePort",
+            "LoadBalancer"
+          ]
+        }
+      }
+    }
+  }
+}

charts/matrix-stack/source/wellKnownDelegation.json

@@ -7,7 +7,7 @@
       "type": "boolean"
     },
     "ingress": {
-      "$ref": "file://common/ingress.json"
+      "$ref": "file://common/ingress_without_host.json"
     },
     "labels": {
       "$ref": "file://common/labels.json"

charts/matrix-stack/templates/well-known/ingress.yaml

@@ -1,5 +1,5 @@
 {{- /*
-Copyright 2024 New Vector Ltd
+Copyright 2024-2025 New Vector Ltd
 
 SPDX-License-Identifier: AGPL-3.0-only
 */ -}}
@@ -15,10 +15,10 @@ metadata:
   name: {{ $.Release.Name }}-well-known
   namespace: {{ $.Release.Namespace }}
 spec:
-{{- include "element-io.ess-library.ingress.tls" (dict "root" $ "context" (dict "host" (.ingress.host | default $.Values.serverName) "ingress" .ingress "ingressName" "well-known")) | nindent 2 }}
+{{- include "element-io.ess-library.ingress.tls" (dict "root" $ "context" (dict "host" $.Values.serverName "ingress" .ingress "ingressName" "well-known")) | nindent 2 }}
 {{- include "element-io.ess-library.ingress.className" (dict "root" $ "context" .ingress.className) | nindent 2 }}
   rules:
-  - host: "{{ tpl ($.Values.wellKnownDelegation.ingress.host | default $.Values.serverName) $ }}"
+  - host: "{{ tpl $.Values.serverName $ }}"
     http:
       paths:
 {{- if and .baseDomainRedirect.enabled (or $.Values.elementWeb.enabled .baseDomainRedirect.url) }}

charts/matrix-stack/values.schema.json

@@ -10243,9 +10243,6 @@
                 ]
               }
             },
-            "host": {
-              "type": "string"
-            },
             "className": {
               "type": "string"
             },

newsfragments/467.changed.md

@@ -0,0 +1 @@
+Remove wellKnownDelegation.ingress.host from values.yaml as serverName is used for the well-known Ingress.