From ae89658b2f5c25bf64d5ced382a1f7f1124a41f4 Mon Sep 17 00:00:00 2001
From: Travis Nielsen <tnielsen@redhat.com>
Date: Mon, 15 Nov 2021 15:08:47 -0700
Subject: [PATCH] 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>
---
 cluster/charts/rook-ceph-cluster/templates/ingress.yaml | 8 ++++++++
 cluster/charts/rook-ceph-cluster/values.yaml            | 2 ++
 2 files changed, 10 insertions(+)

diff --git a/cluster/charts/rook-ceph-cluster/templates/ingress.yaml b/cluster/charts/rook-ceph-cluster/templates/ingress.yaml
index 108afefe81c1..d665de5f28fd 100644
--- 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
index 93fa44c53dab..1ed9b4791d25 100644
--- a/cluster/charts/rook-ceph-cluster/values.yaml
+++ b/cluster/charts/rook-ceph-cluster/values.yaml
@@ -98,6 +98,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: