From 76d0cc3faba190f657980fc46e8004d8833802e1 Mon Sep 17 00:00:00 2001 From: "Alexander \"Ace\" Olofsson" Date: Wed, 8 Sep 2021 09:04:47 +0200 Subject: [PATCH] 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: