From 47d38e621e0c52ae9c2a316baf0138a9b09b2fc6 Mon Sep 17 00:00:00 2001 From: JenTing Hsiao Date: Fri, 30 Jul 2021 10:24:31 +0800 Subject: [PATCH] Bump ingress api version to networking.k8s.io/v1 (#2809) extensions/v1beta1 Ingress is deprecated in v1.14+, unavailable in v1.22+ ref to: https://kubernetes.io/docs/reference/using-api/deprecation-guide/#ingress-v122 Signed-off-by: JenTing Hsiao Co-authored-by: David Ko --- chart/templates/ingress.yaml | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/chart/templates/ingress.yaml b/chart/templates/ingress.yaml index 13555f8..6649206 100644 --- a/chart/templates/ingress.yaml +++ b/chart/templates/ingress.yaml @@ -1,5 +1,9 @@ {{- if .Values.ingress.enabled }} -apiVersion: extensions/v1beta1 +{{- if semverCompare ">=1.19-0" .Capabilities.KubeVersion.GitVersion -}} +apiVersion: networking.k8s.io/v1 +{{- else -}} +apiVersion: networking.k8s.io/v1beta1 +{{- end }} kind: Ingress metadata: name: longhorn-ingress @@ -14,7 +18,7 @@ metadata: {{ $key }}: {{ $value | quote }} {{- end }} spec: - {{- if .Values.ingress.ingressClassName }} + {{- if and .Values.ingress.ingressClassName (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }} ingressClassName: {{ .Values.ingress.ingressClassName }} {{- end }} rules: @@ -22,9 +26,19 @@ spec: http: paths: - path: {{ default "" .Values.ingress.path }} + {{- if (semverCompare ">=1.18-0" $.Capabilities.KubeVersion.GitVersion) }} + pathType: ImplementationSpecific + {{- end }} backend: + {{- if semverCompare ">=1.19-0" $.Capabilities.KubeVersion.GitVersion }} + service: + name: longhorn-frontend + port: + number: 80 + {{- else }} serviceName: longhorn-frontend servicePort: 80 + {{- end }} {{- if .Values.ingress.tls }} tls: - hosts: