Merge pull request #2786 from openshift-cherrypick-robot/cherry-pick-…

…2776-to-release-4.17 Bug 2300312:[release-4.17] disabling rook mgr module in CephCluster
red-hat-storage · Sep 4, 2024 · 56102a0 · 56102a0
2 parents 211e5d3 + 53e91d7
commit 56102a0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 0 deletions.
diff --git 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
@@ -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},
 				},
 			},
 		},