From b8166b9a6b0d1f606816c432ce8417818851ea5f Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Sat, 4 Sep 2021 20:54:28 +0200 Subject: [PATCH 1/7] Fix an ingress template error with well-known --- charts/matrix-synapse/templates/ingress.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index a5d7eaa..541b1ec 100644 --- a/charts/matrix-synapse/templates/ingress.yaml +++ b/charts/matrix-synapse/templates/ingress.yaml @@ -183,7 +183,7 @@ spec: servicePort: 80 {{- end }} - path: /.well-known/matrix/server -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Exact {{- end }} backend: From 6421456f78d7c39265f885f48ee247e7f022c67c Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Sun, 5 Sep 2021 02:54:04 +0200 Subject: [PATCH 2/7] Fix ingress objects for K8s 1.19+ --- charts/element-web/templates/ingress.yaml | 3 ++- charts/funkwhale/templates/ingress.yaml | 3 ++- .../matrix-media-repo/templates/ingress.yaml | 3 ++- charts/matrix-synapse/templates/ingress.yaml | 27 ++++++++++++------- charts/matrix-synapse/values.yaml | 3 ++- charts/netbox/templates/ingress.yaml | 3 ++- charts/radosgw/templates/ingress.yaml | 3 ++- 7 files changed, 30 insertions(+), 15 deletions(-) diff --git a/charts/element-web/templates/ingress.yaml b/charts/element-web/templates/ingress.yaml index 61db19f..be4311d 100644 --- a/charts/element-web/templates/ingress.yaml +++ b/charts/element-web/templates/ingress.yaml @@ -39,7 +39,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: {{ $svcPort }} + port: + number: {{ $svcPort }} {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/funkwhale/templates/ingress.yaml b/charts/funkwhale/templates/ingress.yaml index ae27428..ed5ae79 100644 --- a/charts/funkwhale/templates/ingress.yaml +++ b/charts/funkwhale/templates/ingress.yaml @@ -41,7 +41,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: http + port: + name: http {{- else }} serviceName: {{ $fullName }} servicePort: http diff --git a/charts/matrix-media-repo/templates/ingress.yaml b/charts/matrix-media-repo/templates/ingress.yaml index 72aae7a..5486f33 100644 --- a/charts/matrix-media-repo/templates/ingress.yaml +++ b/charts/matrix-media-repo/templates/ingress.yaml @@ -40,7 +40,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: {{ $svcPort }} + port: + number: {{ $svcPort }} {{- else }} serviceName: {{ $fullName }} servicePort: {{ $svcPort }} diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index 541b1ec..c71f658 100644 --- a/charts/matrix-synapse/templates/ingress.yaml +++ b/charts/matrix-synapse/templates/ingress.yaml @@ -66,7 +66,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} - port: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -80,7 +81,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} - port: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -99,7 +101,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} - port: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -113,7 +116,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} - port: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -144,7 +148,8 @@ spec: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 @@ -160,7 +165,8 @@ spec: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 @@ -177,7 +183,8 @@ spec: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $wkName }} - port: 80 + port: + number: 80 {{- else -}} serviceName: {{ $wkName }} servicePort: 80 @@ -190,7 +197,8 @@ spec: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $wkName }} - port: 80 + port: + number: 80 {{- else }} serviceName: {{ $wkName }} servicePort: 80 @@ -204,7 +212,8 @@ spec: {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml index fdaeaf7..c698e4c 100644 --- a/charts/matrix-synapse/values.yaml +++ b/charts/matrix-synapse/values.yaml @@ -770,7 +770,8 @@ ingress: # backend: # service: # name: matrix-media-repo - # port: 8000 + # port: + # number: 8000 # # K8s <1.19 # - path: /_matrix/media # backend: diff --git a/charts/netbox/templates/ingress.yaml b/charts/netbox/templates/ingress.yaml index 6627cc9..22588fb 100644 --- a/charts/netbox/templates/ingress.yaml +++ b/charts/netbox/templates/ingress.yaml @@ -43,7 +43,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: http + port: + name: http {{- else }} serviceName: {{ $fullName }} servicePort: http diff --git a/charts/radosgw/templates/ingress.yaml b/charts/radosgw/templates/ingress.yaml index d62040a..ec2bf1b 100644 --- a/charts/radosgw/templates/ingress.yaml +++ b/charts/radosgw/templates/ingress.yaml @@ -37,7 +37,8 @@ spec: {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} - port: http + port: + name: http {{- else }} serviceName: {{ $fullName }} servicePort: http From f163ecafa8e174d90cd6a3ec3385ca8a01063269 Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Wed, 8 Sep 2021 09:01:31 +0200 Subject: [PATCH 3/7] matrix-synapse: Update to 1.42.0 --- charts/matrix-synapse/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/matrix-synapse/Chart.yaml b/charts/matrix-synapse/Chart.yaml index c3ad28c..e2558c6 100644 --- a/charts/matrix-synapse/Chart.yaml +++ b/charts/matrix-synapse/Chart.yaml @@ -3,10 +3,10 @@ apiVersion: v2 name: matrix-synapse description: Matrix reference homeserver icon: https://matrix.org/images/matrix-logo.svg -appVersion: 1.41.1 +appVersion: 1.42.0 type: application -version: 2.1.8 +version: 2.1.9 maintainers: - name: Alexander Olofsson email: ace@haxalot.com From 76d0cc3faba190f657980fc46e8004d8833802e1 Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Wed, 8 Sep 2021 09:04:47 +0200 Subject: [PATCH 4/7] Final fix for ingress K8s version comparisons --- charts/matrix-synapse/templates/ingress.yaml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index c71f658..f957ff8 100644 --- a/charts/matrix-synapse/templates/ingress.yaml +++ b/charts/matrix-synapse/templates/ingress.yaml @@ -59,11 +59,11 @@ spec: {{- range $config.csPaths }} {{- if $.Values.ingress.traefikPaths }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} -{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -74,11 +74,11 @@ spec: {{- end }} {{- else }} - path: {{ . | quote }} -{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -94,11 +94,11 @@ spec: {{- range $config.paths }} {{- if $.Values.ingress.traefikPaths }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} -{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -109,11 +109,11 @@ spec: {{- end }} {{- else }} - path: {{ . | quote }} -{{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: From f44a59de98884b7f7f1606d2d56f0c4fc5a9d456 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Fri, 10 Sep 2021 13:39:41 +0200 Subject: [PATCH 5/7] matrix-synapse: Fix potential linebreak issues --- charts/matrix-synapse/templates/ingress.yaml | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index f957ff8..f863707 100644 --- a/charts/matrix-synapse/templates/ingress.yaml +++ b/charts/matrix-synapse/templates/ingress.yaml @@ -1,9 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "matrix-synapse.fullname" . -}} {{- $wkName := include "matrix-synapse.externalname" (dict "global" . "external" "wellknown-lighttpd") -}} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} +{{- else }} apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress @@ -63,7 +63,7 @@ spec: pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -78,7 +78,7 @@ spec: pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -98,7 +98,7 @@ spec: pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -113,7 +113,7 @@ spec: pathType: ImplementationSpecific {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $service }} port: @@ -141,11 +141,11 @@ spec: {{- if or (has . $csHosts) (has . $s2sHosts) }} - path: /_matrix -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Prefix {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: @@ -158,11 +158,11 @@ spec: {{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }} - path: /_synapse -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Prefix {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: @@ -176,25 +176,25 @@ spec: {{- if has . $wkHosts }} {{- if $.Values.wellknown.enabled }} - path: /.well-known/matrix/client -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Exact {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $wkName }} port: number: 80 -{{- else -}} +{{- else }} serviceName: {{ $wkName }} servicePort: 80 {{- end }} - path: /.well-known/matrix/server -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Exact {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $wkName }} port: @@ -205,11 +205,11 @@ spec: {{- end }} {{- else }} - path: /.well-known/matrix/client -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Exact {{- end }} backend: -{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: From 047855266448b0979903e31c651190d2e25baee0 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Sat, 11 Sep 2021 14:58:24 +0200 Subject: [PATCH 6/7] element-web: Fix K8s 1.19+ ingress configuration --- charts/element-web/templates/ingress.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/charts/element-web/templates/ingress.yaml b/charts/element-web/templates/ingress.yaml index be4311d..4b4f50a 100644 --- a/charts/element-web/templates/ingress.yaml +++ b/charts/element-web/templates/ingress.yaml @@ -1,9 +1,9 @@ {{- if .Values.ingress.enabled -}} {{- $fullName := include "element-web.fullname" . -}} {{- $svcPort := .Values.service.port -}} -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} apiVersion: networking.k8s.io/v1 -{{- else -}} +{{- else }} apiVersion: networking.k8s.io/v1beta1 {{- end }} kind: Ingress @@ -32,11 +32,11 @@ spec: http: paths: - path: / -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} pathType: Prefix {{- end }} backend: -{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }} +{{ if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} service: name: {{ $fullName }} port: From 95632ef2f8c85b186aa2a1a93a02a982e22f3ae1 Mon Sep 17 00:00:00 2001 From: Alexander Olofsson Date: Mon, 13 Sep 2021 15:00:54 +0200 Subject: [PATCH 7/7] element-web: Update to 1.0.34 --- charts/element-web/Chart.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/charts/element-web/Chart.yaml b/charts/element-web/Chart.yaml index 06a2524..fd3f62b 100644 --- a/charts/element-web/Chart.yaml +++ b/charts/element-web/Chart.yaml @@ -7,10 +7,10 @@ description: | Talk to everyone through the open global Matrix network, protected by proper end-to-end encryption. icon: https://element.io/images/element-logo.svg -appVersion: 1.8.2 +appVersion: 1.8.4 type: application -version: 1.0.33 +version: 1.0.34 maintainers: - name: Alexander Olofsson