Merge pull request #9280 from TomHellier/test-helm-on-multiple-versions

helm: Use a more explicit value for ingress for K8s 1.18
rook · Dec 2, 2021 · 2efa571 · 2efa571
2 parents 8c60f6f + 2ca93e5
commit 2efa571
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/deploy/charts/rook-ceph-cluster/templates/ingress.yaml b/deploy/charts/rook-ceph-cluster/templates/ingress.yaml
@@ -14,14 +14,7 @@ spec:
         paths:
           - path: {{ .Values.ingress.dashboard.host.path | default "/" }}
             backend:
-{{- if (semverCompare "<1.18-0" (include "capabilities.kubeVersion" .)) }}
-              serviceName: rook-ceph-mgr-dashboard
-              {{- if .Values.cephClusterSpec.dashboard.ssl }}
-              servicePort: https-dashboard
-              {{- else }}
-              servicePort: http-dashboard
-              {{- end }}
-{{- else }}
+{{- if (eq "networking.k8s.io/v1" (include "capabilities.ingress.apiVersion" .)) }}
               service:
                 name: rook-ceph-mgr-dashboard
                 port:
@@ -31,6 +24,13 @@ spec:
                   name: http-dashboard
                   {{- end }}
             pathType: Prefix
+{{- else }}
+              serviceName: rook-ceph-mgr-dashboard
+              {{- if .Values.cephClusterSpec.dashboard.ssl }}
+              servicePort: https-dashboard
+              {{- else }}
+              servicePort: http-dashboard
+              {{- end }}
 {{- end }}
   {{- if .Values.ingress.dashboard.tls }}
   tls: {{- toYaml .Values.ingress.dashboard.tls | nindent 4 }}