Fix template rendering issues

This commit is contained in:
Alexander Olofsson 2021-09-03 09:58:36 +02:00
parent 8097280ab0
commit 70184f417f
No known key found for this signature in database
GPG key ID: D439C9470CB04C73
6 changed files with 69 additions and 69 deletions

View file

@ -32,17 +32,17 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: {{ $svcPort }} port: {{ $svcPort }}
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -34,16 +34,16 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: http port: http
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end -}} {{- end }}
{{- end }} {{- end }}

View file

@ -33,18 +33,18 @@ spec:
paths: paths:
{{- range .paths }} {{- range .paths }}
- path: {{ . }} - path: {{ . }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: {{ $svcPort }} port: {{ $svcPort }}
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: {{ $svcPort }} servicePort: {{ $svcPort }}
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -59,32 +59,32 @@ spec:
{{- range $config.csPaths }} {{- range $config.csPaths }}
{{- if $.Values.ingress.traefikPaths }} {{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port: 8083
{{- else -}} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end -}} {{- end }}
{{- else }} {{- else }}
- path: {{ . | quote }} - path: {{ . | quote }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port: 8083
{{- else -}} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -92,32 +92,32 @@ spec:
{{- range $config.paths }} {{- range $config.paths }}
{{- if $.Values.ingress.traefikPaths }} {{- if $.Values.ingress.traefikPaths }}
- path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }} - path: {{ printf "/{path:%s}" (trimPrefix "/" .) | quote }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port: 8083
{{- else -}} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end -}} {{- end }}
{{- else }} {{- else }}
- path: {{ . | quote }} - path: {{ . | quote }}
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{ if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: ImplementationSpecific pathType: ImplementationSpecific
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $service }} name: {{ $service }}
port: 8083 port: 8083
{{- else -}} {{- else }}
serviceName: {{ $service }} serviceName: {{ $service }}
servicePort: 8083 servicePort: 8083
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
@ -137,78 +137,78 @@ spec:
{{- if or (has . $csHosts) (has . $s2sHosts) }} {{- if or (has . $csHosts) (has . $s2sHosts) }}
- path: /_matrix - path: /_matrix
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port: 8008
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }} {{- if and (has . $csHosts) $.Values.ingress.includeUnderscoreSynapse }}
- path: /_synapse - path: /_synapse
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port: 8008
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- if has . $wkHosts }} {{- if has . $wkHosts }}
{{- if $.Values.wellknown.enabled }} {{- if $.Values.wellknown.enabled }}
- path: /.well-known/matrix/client - path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: 80 port: 80
{{- else -}} {{- else -}}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
{{- end -}} {{- end }}
- path: /.well-known/matrix/server - path: /.well-known/matrix/server
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $wkName }} name: {{ $wkName }}
port: 80 port: 80
{{- else -}} {{- else }}
serviceName: {{ $wkName }} serviceName: {{ $wkName }}
servicePort: 80 servicePort: 80
{{- end -}} {{- end }}
{{- else }} {{- else }}
- path: /.well-known/matrix/client - path: /.well-known/matrix/client
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
pathType: Exact pathType: Exact
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: 8008 port: 8008
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: 8008 servicePort: 8008
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -36,17 +36,17 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: http port: http
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end -}} {{- end }}
{{- end }} {{- end }}
{{- end }} {{- end }}

View file

@ -30,16 +30,16 @@ spec:
http: http:
paths: paths:
- path: / - path: /
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
pathType: Prefix pathType: Prefix
{{- end -}} {{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion }}
service: service:
name: {{ $fullName }} name: {{ $fullName }}
port: http port: http
{{- else -}} {{- else }}
serviceName: {{ $fullName }} serviceName: {{ $fullName }}
servicePort: http servicePort: http
{{- end -}} {{- end }}
{{- end }} {{- end }}