Upgrade: Longhorn from 1.5.2 to 1.6.4
Change-Id: I8cdc3c0a07133f00442b496800ccc30e2c1dad61
diff --git a/charts/longhorn/templates/ingress.yaml b/charts/longhorn/templates/ingress.yaml
index ee47f8b..9038ff0 100644
--- a/charts/longhorn/templates/ingress.yaml
+++ b/charts/longhorn/templates/ingress.yaml
@@ -1,9 +1,5 @@
{{- if .Values.ingress.enabled }}
-{{- 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
@@ -18,7 +14,7 @@
{{ $key }}: {{ $value | quote }}
{{- end }}
spec:
- {{- if and .Values.ingress.ingressClassName (semverCompare ">=1.18-0" .Capabilities.KubeVersion.GitVersion) }}
+ {{- if .Values.ingress.ingressClassName }}
ingressClassName: {{ .Values.ingress.ingressClassName }}
{{- end }}
rules:
@@ -26,19 +22,12 @@
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: