Include pathType on all ingress paths for 1.19+
This commit is contained in:
parent
16c2b8b648
commit
8097280ab0
6 changed files with 42 additions and 0 deletions
|
@ -32,6 +32,9 @@ spec:
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
|
@ -34,6 +34,9 @@ spec:
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
|
@ -33,6 +33,9 @@ spec:
|
||||||
paths:
|
paths:
|
||||||
{{- range .paths }}
|
{{- range .paths }}
|
||||||
- path: {{ . }}
|
- path: {{ . }}
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
|
@ -59,6 +59,9 @@ 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 -}}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -70,6 +73,9 @@ spec:
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- path: {{ . | quote }}
|
- path: {{ . | quote }}
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -86,6 +92,9 @@ 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 -}}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -97,6 +106,9 @@ spec:
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- path: {{ . | quote }}
|
- path: {{ . | quote }}
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -125,6 +137,9 @@ 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 -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -138,6 +153,9 @@ spec:
|
||||||
|
|
||||||
{{- 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 -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -152,6 +170,9 @@ spec:
|
||||||
{{- 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 -}}
|
||||||
|
pathType: Exact
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -162,6 +183,9 @@ spec:
|
||||||
servicePort: 80
|
servicePort: 80
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
- path: /.well-known/matrix/server
|
- path: /.well-known/matrix/server
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Exact
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
@ -173,6 +197,9 @@ spec:
|
||||||
{{- end -}}
|
{{- end -}}
|
||||||
{{- else }}
|
{{- else }}
|
||||||
- path: /.well-known/matrix/client
|
- path: /.well-known/matrix/client
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Exact
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
|
@ -36,6 +36,9 @@ spec:
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
|
@ -30,6 +30,9 @@ spec:
|
||||||
http:
|
http:
|
||||||
paths:
|
paths:
|
||||||
- path: /
|
- path: /
|
||||||
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
|
pathType: Prefix
|
||||||
|
{{- end -}}
|
||||||
backend:
|
backend:
|
||||||
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
service:
|
service:
|
||||||
|
|
Loading…
Reference in a new issue