Add support >= 1.22 (#17490)
This commit is contained in:
parent
3aebe711fd
commit
5533fa28b6
1 changed files with 23 additions and 1 deletions
|
@ -2,7 +2,9 @@
|
||||||
{{- $fullName := include "mastodon.fullname" . -}}
|
{{- $fullName := include "mastodon.fullname" . -}}
|
||||||
{{- $webPort := .Values.mastodon.web.port -}}
|
{{- $webPort := .Values.mastodon.web.port -}}
|
||||||
{{- $streamingPort := .Values.mastodon.streaming.port -}}
|
{{- $streamingPort := .Values.mastodon.streaming.port -}}
|
||||||
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
|
{{- if or (.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not (.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
|
||||||
|
apiVersion: networking.k8s.io/v1
|
||||||
|
{{- else if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}}
|
||||||
apiVersion: networking.k8s.io/v1beta1
|
apiVersion: networking.k8s.io/v1beta1
|
||||||
{{- else -}}
|
{{- else -}}
|
||||||
apiVersion: extensions/v1beta1
|
apiVersion: extensions/v1beta1
|
||||||
|
@ -35,12 +37,32 @@ spec:
|
||||||
{{- range .paths }}
|
{{- range .paths }}
|
||||||
- path: {{ .path }}
|
- path: {{ .path }}
|
||||||
backend:
|
backend:
|
||||||
|
{{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
|
||||||
|
service:
|
||||||
|
name: {{ $fullName }}-web
|
||||||
|
port:
|
||||||
|
number: {{ $webPort }}
|
||||||
|
{{- else }}
|
||||||
serviceName: {{ $fullName }}-web
|
serviceName: {{ $fullName }}-web
|
||||||
servicePort: {{ $webPort }}
|
servicePort: {{ $webPort }}
|
||||||
|
{{- end }}
|
||||||
|
{{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end }}
|
||||||
- path: {{ .path }}api/v1/streaming
|
- path: {{ .path }}api/v1/streaming
|
||||||
backend:
|
backend:
|
||||||
|
{{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
|
||||||
|
service:
|
||||||
|
name: {{ $fullName }}-streaming
|
||||||
|
port:
|
||||||
|
number: {{ $streamingPort }}
|
||||||
|
{{- else }}
|
||||||
serviceName: {{ $fullName }}-streaming
|
serviceName: {{ $fullName }}-streaming
|
||||||
servicePort: {{ $streamingPort }}
|
servicePort: {{ $streamingPort }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
{{- if or ($.Capabilities.APIVersions.Has "networking.k8s.io/v1/Ingress") (not ($.Capabilities.APIVersions.Has "networking.k8s.io/v1beta1/Ingress")) }}
|
||||||
|
pathType: ImplementationSpecific
|
||||||
|
{{- end }}
|
||||||
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
{{- end }}
|
{{- end }}
|
||||||
|
|
Loading…
Reference in a new issue