helm: set correct ingress endpoint protocol

In the helm chart, the ingress for the dashbard was always referring to the http-dashboard port on the dashboard service. If ssl is enabled the https-dashboard port must be specified, or else the dashboard will not be available through the ingress. The default is also changed from http to https when the dashboard is installed through the cluster helm chart. Signed-off-by: Travis Nielsen <tnielsen@redhat.com> (cherry picked from commit ae89658)
rook · Nov 16, 2021 · 3d2fd50 · 3d2fd50
1 parent 9730997
commit 3d2fd50
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/cluster/charts/rook-ceph-cluster/templates/ingress.yaml b/cluster/charts/rook-ceph-cluster/templates/ingress.yaml
@@ -24,11 +24,19 @@ spec:
               service:
                 name: rook-ceph-mgr-dashboard
                 port:
+                  {{- if .Values.cephClusterSpec.dashboard.ssl }}
+                  name: https-dashboard
+                  {{- else }}
                   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 }}

diff --git a/cluster/charts/rook-ceph-cluster/values.yaml b/cluster/charts/rook-ceph-cluster/values.yaml
@@ -95,6 +95,8 @@ cephClusterSpec:
     # urlPrefix: /ceph-dashboard
     # serve the dashboard at the given port.
     # port: 8443
+    # serve the dashboard using SSL
+    ssl: true
 
   # Network configuration, see: https://github.com/rook/rook/blob/master/Documentation/ceph-cluster-crd.md#network-configuration-settings
   # network: