mirror of
https://github.com/matrix-org/dendrite.git
synced 2025-12-07 15:03:09 -06:00
b538f237df
This updates the matchers for deriving the host values from the dendrite config. The original version turned out to have 2 complications: - It did not support IPv6 addresses as host value - It failed for `well_known_client_host` which is a (base) URL instead of a hostname+port. I've verified `well_known_server_name` with ``` dendrite.example.net:443 dendrite.example.net 192.168.1.1 192.168.1.1:1324 [dead::beef]:1234 [dead::beef] [ffff:dead::beef] ``` and `well_known_client_name` with: ``` https://dendrite.example.net:443 https://dendrite.example.net https://dendrite.example.net/ http://dendrite.example.net:8080/ http://192.168.1.1 http://192.168.1.1:8080/ http://[dead::beef]:1234 http://[dead::beef]/ http://[ffff:dead::beef] ``` Fixes #3175 ### Pull Request Checklist <!-- Please read https://matrix-org.github.io/dendrite/development/contributing before submitting your pull request --> * [x] I have added Go unit tests or [Complement integration tests](https://github.com/matrix-org/complement) for this PR _or_ I have justified why this PR doesn't need tests * [x] Pull request includes a [sign off below using a legally identifiable name](https://matrix-org.github.io/dendrite/development/contributing#sign-off) _or_ I have already signed off privately Signed-off-by: `Omar Pakker <Omar007@users.noreply.github.com>` --------- Signed-off-by: Omar Pakker <Omar007@users.noreply.github.com> [skip CI]
116 lines
3.9 KiB
YAML
116 lines
3.9 KiB
YAML
{{- if .Values.ingress.enabled -}}
|
|
{{- $fullName := include "dendrite.fullname" . -}}
|
|
{{- $serverNameHost := .Values.dendrite_config.global.server_name -}}
|
|
{{- $wellKnownServerHost := default $serverNameHost (regexFind "^(\\[.+\\])?[^:]*" .Values.dendrite_config.global.well_known_server_name) -}}
|
|
{{- $wellKnownClientHost := default $serverNameHost (regexFind "//(\\[.+\\])?[^:/]*" .Values.dendrite_config.global.well_known_client_name | trimAll "/") -}}
|
|
{{- $allHosts := list $serverNameHost $wellKnownServerHost $wellKnownClientHost | uniq -}}
|
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
|
apiVersion: networking.k8s.io/v1
|
|
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
|
|
apiVersion: networking.k8s.io/v1beta1
|
|
{{- else -}}
|
|
apiVersion: extensions/v1beta1
|
|
{{- end }}
|
|
kind: Ingress
|
|
metadata:
|
|
name: {{ $fullName }}
|
|
labels:
|
|
{{- include "dendrite.labels" . | nindent 4 }}
|
|
annotations:
|
|
{{- if and .Values.ingress.className (not (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion)) }}
|
|
kubernetes.io/ingress.class: {{ .Values.ingress.className }}
|
|
{{- end }}
|
|
{{- with .Values.ingress.annotations }}
|
|
{{- toYaml . | nindent 4 }}
|
|
{{- end }}
|
|
spec:
|
|
{{- if and .Values.ingress.className (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
|
|
ingressClassName: {{ .Values.ingress.className }}
|
|
{{- end }}
|
|
{{- if kindIs "slice" .Values.ingress.tls }}
|
|
tls:
|
|
{{- range .Values.ingress.tls }}
|
|
- hosts:
|
|
{{- range .hosts }}
|
|
- {{ . | quote }}
|
|
{{- end }}
|
|
secretName: {{ .secretName }}
|
|
{{- end }}
|
|
{{- else if .Values.ingress.tls.generate }}
|
|
tls:
|
|
- hosts:
|
|
{{- range $allHosts }}
|
|
- {{ . | quote }}
|
|
{{- end }}
|
|
secretName: {{ $fullName }}-ingress-tls
|
|
{{- end }}
|
|
rules:
|
|
{{- if .Values.ingress.hostName }}
|
|
- host: {{ .Values.ingress.hostName | quote }}
|
|
http:
|
|
paths:
|
|
- path: /
|
|
pathType: ImplementationSpecific
|
|
backend:
|
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
|
service:
|
|
name: {{ $fullName }}
|
|
port:
|
|
name: http
|
|
{{- else }}
|
|
serviceName: {{ $fullName }}
|
|
servicePort: http
|
|
{{- end }}
|
|
{{- else }}
|
|
- host: {{ $serverNameHost | quote }}
|
|
http:
|
|
paths:
|
|
- path: /.well-known/matrix
|
|
pathType: Prefix
|
|
backend:
|
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
|
service:
|
|
name: {{ $fullName }}
|
|
port:
|
|
name: http
|
|
{{- else }}
|
|
serviceName: {{ $fullName }}
|
|
servicePort: http
|
|
{{- end }}
|
|
- host: {{ $wellKnownServerHost | quote }}
|
|
http:
|
|
paths:
|
|
{{- range list "/_matrix/key" "/_matrix/federation" }}
|
|
- path: {{ . | quote }}
|
|
pathType: Prefix
|
|
backend:
|
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
|
service:
|
|
name: {{ $fullName }}
|
|
port:
|
|
name: http
|
|
{{- else }}
|
|
serviceName: {{ $fullName }}
|
|
servicePort: http
|
|
{{- end }}
|
|
{{- end }}
|
|
- host: {{ $wellKnownClientHost | quote }}
|
|
http:
|
|
paths:
|
|
{{- range list "/_matrix/client" "/_matrix/media" }}
|
|
- path: {{ . | quote }}
|
|
pathType: Prefix
|
|
backend:
|
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
|
|
service:
|
|
name: {{ $fullName }}
|
|
port:
|
|
name: http
|
|
{{- else }}
|
|
serviceName: {{ $fullName }}
|
|
servicePort: http
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|
|
{{- end }}
|