From 53e91d78baf7ac27f896c87ebf821107a0df0bfb Mon Sep 17 00:00:00 2001 From: ShravaniVangur Date: Mon, 2 Sep 2024 17:46:02 +0530 Subject: [PATCH] disable rook mgr module in CephCluster Disable rook mgr module during installation with ODF. Signed-off-by: ShravaniVangur --- controllers/storagecluster/cephcluster.go | 1 + controllers/storagecluster/cephcluster_test.go | 4 ++++ 2 files changed, 5 insertions(+) diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go index 4db965dc15..00ca61f543 100644 --- a/controllers/storagecluster/cephcluster.go +++ b/controllers/storagecluster/cephcluster.go @@ -1101,6 +1101,7 @@ func generateMgrSpec(sc *ocsv1.StorageCluster) rookCephv1.MgrSpec { Modules: []rookCephv1.Module{ {Name: "pg_autoscaler", Enabled: true}, {Name: "balancer", Enabled: true}, + {Name: "rook", Enabled: false}, }, } diff --git a/controllers/storagecluster/cephcluster_test.go b/controllers/storagecluster/cephcluster_test.go index 9dfb4838e1..002feb82fe 100644 --- a/controllers/storagecluster/cephcluster_test.go +++ b/controllers/storagecluster/cephcluster_test.go @@ -306,6 +306,7 @@ func TestGenerateMgrSpec(t *testing.T) { Modules: []rookCephv1.Module{ {Name: "pg_autoscaler", Enabled: true}, {Name: "balancer", Enabled: true}, + {Name: "rook", Enabled: false}, }, }, }, @@ -326,6 +327,7 @@ func TestGenerateMgrSpec(t *testing.T) { Modules: []rookCephv1.Module{ {Name: "pg_autoscaler", Enabled: true}, {Name: "balancer", Enabled: true}, + {Name: "rook", Enabled: false}, }, }, }, @@ -349,6 +351,7 @@ func TestGenerateMgrSpec(t *testing.T) { Modules: []rookCephv1.Module{ {Name: "pg_autoscaler", Enabled: true}, {Name: "balancer", Enabled: true}, + {Name: "rook", Enabled: false}, }, }, }, @@ -362,6 +365,7 @@ func TestGenerateMgrSpec(t *testing.T) { Modules: []rookCephv1.Module{ {Name: "pg_autoscaler", Enabled: true}, {Name: "balancer", Enabled: true}, + {Name: "rook", Enabled: false}, }, }, },