Skip to content

Remove ingress.host from wellKnownDelegation #467

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 22, 2025
Merged

Remove ingress.host from wellKnownDelegation #467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4f4138
Rename ingress_without_host to ingress_global as its schema is subtly…
benbz May 20, 2025
0e3c5eb
Remove ingress.host from Well-Known Delegation
benbz May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 42 additions & 0 deletions charts/matrix-stack/source/common/ingress_global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"type": "object",
"properties": {
"annotations": {
"type": "object",
"additionalProperties": {
"type": "string"
}
},
"className": {
"type": "string"
},
"tlsEnabled": {
"type": "boolean"
},
"tlsSecret": {
"type": "string"
},
"controllerType": {
"type": "string",
"enum": [
"ingress-nginx"
]
},
"service": {
"type": "object",
"required": [
"type"
],
"properties": {
"type": {
"type": "string",
"enum": [
"ClusterIP",
"NodePort",
"LoadBalancer"
]
}
}
}
}
}
8 changes: 4 additions & 4 deletions charts/matrix-stack/source/common/ingress_without_host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@
"annotations": {
"type": "object",
"additionalProperties": {
"type": "string"
"type": [
"string",
"null"
]
}
},
"className": {
Expand All @@ -24,9 +27,6 @@
},
"service": {
"type": "object",
"required": [
"type"
],
"properties": {
"type": {
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion charts/matrix-stack/source/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
}
},
"ingress": {
"$ref": "file://common/ingress_without_host.json"
"$ref": "file://common/ingress_global.json"
},
"tolerations": {
"$ref": "file://common/tolerations.json"
Expand Down
2 changes: 1 addition & 1 deletion charts/matrix-stack/source/wellKnownDelegation.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
6 changes: 3 additions & 3 deletions charts/matrix-stack/templates/well-known/ingress.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{- /*
Copyright 2024 New Vector Ltd
Copyright 2024-2025 New Vector Ltd

SPDX-License-Identifier: AGPL-3.0-only
*/ -}}
Expand All @@ -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) }}
Expand Down
3 changes: 0 additions & 3 deletions charts/matrix-stack/values.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10243,9 +10243,6 @@
]
}
},
"host": {
"type": "string"
},
"className": {
"type": "string"
},
Expand Down
1 change: 1 addition & 0 deletions newsfragments/467.changed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Remove wellKnownDelegation.ingress.host from values.yaml as serverName is used for the well-known Ingress.
Loading