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 diff --git a/charts/element-web/templates/ingress.yaml b/charts/element-web/templates/ingress.yaml index 61db19f..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,14 +32,15 @@ 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: {{ $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/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 diff --git a/charts/matrix-synapse/templates/ingress.yaml b/charts/matrix-synapse/templates/ingress.yaml index a5d7eaa..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 @@ -59,28 +59,30 @@ 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: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 {{- 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: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -92,28 +94,30 @@ 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: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 {{- 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: 8083 + port: + number: 8083 {{- else }} serviceName: {{ $service }} servicePort: 8083 @@ -137,14 +141,15 @@ 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: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 @@ -153,14 +158,15 @@ 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: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 @@ -170,41 +176,44 @@ 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: 80 -{{- else -}} + port: + number: 80 +{{- 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: 80 + port: + number: 80 {{- else }} serviceName: {{ $wkName }} servicePort: 80 {{- 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: 8008 + port: + number: 8008 {{- else }} serviceName: {{ $fullName }} servicePort: 8008 diff --git a/charts/matrix-synapse/values.yaml b/charts/matrix-synapse/values.yaml index a8e8559..8328703 100644 --- a/charts/matrix-synapse/values.yaml +++ b/charts/matrix-synapse/values.yaml @@ -780,7 +780,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