yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6368 from Spycsh/main-v4.3 

chore: fix main-v4.3 support for networking.k8s.io/v1
This commit is contained in:
tigercl 2021-12-10 18:07:11 +08:00 committed by GitHub
parent 9a43125c9b 5c497975a6
commit f1c707e4de
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
deploy/charts/emqx/templates/ingress.yaml
View File

@ -1,5 +1,7 @@
{{- if .Values.ingress.dashboard.enabled -}} {{- if .Values.ingress.dashboard.enabled -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
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
@ -17,15 +19,28 @@ metadata:
{{- toYaml .Values.ingress.dashboard.annotations | nindent 4 }} {{- toYaml .Values.ingress.dashboard.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if and .Values.ingress.dashboard.ingressClassName (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
ingressClassName: {{ .Values.ingress.dashboard.ingressClassName }}
{{- end }}
rules: rules:
{{- range $host := .Values.ingress.dashboard.hosts }} {{- range $host := .Values.ingress.dashboard.hosts }}
- host: {{ $host }} - host: {{ $host }}
http: http:
paths: paths:
- path: / - path: /
{{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ include "emqx.fullname" $ }}
port:
number: {{ $.Values.service.dashboard }}
{{- else }}
serviceName: {{ include "emqx.fullname" $ }} serviceName: {{ include "emqx.fullname" $ }}
servicePort: {{ $.Values.service.dashboard }} servicePort: {{ $.Values.service.dashboard }}
{{- end }}
{{- end -}} {{- end -}}
{{- if .Values.ingress.dashboard.tls }} {{- if .Values.ingress.dashboard.tls }}
tls: tls:
@ -34,7 +49,9 @@ spec:
--- ---
{{- end }} {{- end }}
{{- if .Values.ingress.mgmt.enabled -}} {{- if .Values.ingress.mgmt.enabled -}}
{{- if semverCompare ">=1.14-0" .Capabilities.KubeVersion.GitVersion -}} {{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}}
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
@ -52,15 +69,28 @@ metadata:
{{- toYaml .Values.ingress.mgmt.annotations | nindent 4 }} {{- toYaml .Values.ingress.mgmt.annotations | nindent 4 }}
{{- end }} {{- end }}
spec: spec:
{{- if and .Values.ingress.mgmt.ingressClassName (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
ingressClassName: {{ .Values.ingress.mgmt.ingressClassName }}
{{- end }}
rules: rules:
{{- range $host := .Values.ingress.mgmt.hosts }} {{- range $host := .Values.ingress.mgmt.hosts }}
- host: {{ $host }} - host: {{ $host }}
http: http:
paths: paths:
- path: / - path: /
{{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }}
pathType: ImplementationSpecific
{{- end }}
backend: backend:
{{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }}
service:
name: {{ include "emqx.fullname" $ }}
port:
number: {{ $.Values.service.mgmt }}
{{- else }}
serviceName: {{ include "emqx.fullname" $ }} serviceName: {{ include "emqx.fullname" $ }}
servicePort: {{ $.Values.service.mgmt }} servicePort: {{ $.Values.service.mgmt }}
{{- end }}
{{- end -}} {{- end -}}
{{- if .Values.ingress.mgmt.tls }} {{- if .Values.ingress.mgmt.tls }}
tls: tls: