Merge pull request #9184 from rook/mergify/bp/release-1.7/pr-9181

helm: Set correct ingress endpoint protocol (backport #9181)
rook · Nov 16, 2021 · 20b74f0 · 20b74f0
2 parents 9730997 + 3d2fd50
commit 20b74f0
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: