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

…2747-to-release-4.17 Bug 2304238: [release-4.17] remove upmap-read balancer mode
red-hat-storage · Aug 14, 2024 · 7a0d516 · 7a0d516
2 parents 14a9612 + 8f24151
commit 7a0d516
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/controllers/storagecluster/cephcluster.go b/controllers/storagecluster/cephcluster.go
@@ -72,7 +72,6 @@ const (
  networkProvider = "multus"
  publicNetworkSelectorKey = "public"
  clusterNetworkSelectorKey = "cluster"
- upmapReadBalancerMode = "upmap-read"
 )
 
 const (
@@ -1100,7 +1099,7 @@ func generateMgrSpec(sc *ocsv1.StorageCluster) rookCephv1.MgrSpec {
  AllowMultiplePerNode: statusutil.IsSingleNodeDeployment(),
  Modules: []rookCephv1.Module{
  {Name: "pg_autoscaler", Enabled: true},
- {Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
+ {Name: "balancer", Enabled: true},
  },
  }
 

diff --git a/controllers/storagecluster/cephcluster_test.go b/controllers/storagecluster/cephcluster_test.go
@@ -305,7 +305,7 @@ func TestGenerateMgrSpec(t *testing.T) {
  AllowMultiplePerNode: false,
  Modules: []rookCephv1.Module{
  {Name: "pg_autoscaler", Enabled: true},
- {Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
+ {Name: "balancer", Enabled: true},
  },
  },
  },
@@ -325,7 +325,7 @@ func TestGenerateMgrSpec(t *testing.T) {
  AllowMultiplePerNode: false,
  Modules: []rookCephv1.Module{
  {Name: "pg_autoscaler", Enabled: true},
- {Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
+ {Name: "balancer", Enabled: true},
  },
  },
  },
@@ -348,7 +348,7 @@ func TestGenerateMgrSpec(t *testing.T) {
  AllowMultiplePerNode: false,
  Modules: []rookCephv1.Module{
  {Name: "pg_autoscaler", Enabled: true},
- {Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
+ {Name: "balancer", Enabled: true},
  },
  },
  },
@@ -361,7 +361,7 @@ func TestGenerateMgrSpec(t *testing.T) {
  AllowMultiplePerNode: true,
  Modules: []rookCephv1.Module{
  {Name: "pg_autoscaler", Enabled: true},
- {Name: "balancer", Enabled: true, Settings: rookCephv1.ModuleSettings{BalancerMode: upmapReadBalancerMode}},
+ {Name: "balancer", Enabled: true},
  },
  },
  },