From a36c15547b4bb2d588ffb64cc81cf18a62ef75b5 Mon Sep 17 00:00:00 2001 From: Travis Nielsen Date: Wed, 16 Jun 2021 14:51:29 -0600 Subject: [PATCH] ceph: allow overriding cluster CR name in helm chart The cluster CR name defaults to the namespace where the CR is created. This name may need to be overridden if the chart is taking over a cluster that had been previously created with a different name. Signed-off-by: Travis Nielsen --- cluster/charts/rook-ceph-cluster/templates/cephcluster.yaml | 2 +- cluster/charts/rook-ceph-cluster/values.yaml | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cluster/charts/rook-ceph-cluster/templates/cephcluster.yaml b/cluster/charts/rook-ceph-cluster/templates/cephcluster.yaml index 2ed2c6422..75d60039c 100644 --- a/cluster/charts/rook-ceph-cluster/templates/cephcluster.yaml +++ b/cluster/charts/rook-ceph-cluster/templates/cephcluster.yaml @@ -2,7 +2,7 @@ apiVersion: ceph.rook.io/v1 kind: CephCluster metadata: - name: {{ .Release.Namespace }} + name: {{ default .Release.Namespace .Values.clusterName }} spec: monitoring: rulesNamespace: {{ default .Release.Namespace .Values.monitoring.rulesNamespaceOverride }} diff --git a/cluster/charts/rook-ceph-cluster/values.yaml b/cluster/charts/rook-ceph-cluster/values.yaml index 9764b2ff0..b84d0dbcc 100644 --- a/cluster/charts/rook-ceph-cluster/values.yaml +++ b/cluster/charts/rook-ceph-cluster/values.yaml @@ -5,6 +5,9 @@ # Namespace of the main rook operator operatorNamespace: rook-ceph +# The metadata.name of the CephCluster CR. The default name is the same as the namespace. +#clusterName: rook-ceph + # Ability to override ceph.conf configOverride: #configOverride: |