chore: remove KubeBlocks type roleArbitrator and replace with Lorry (a…

…pecloud#6107)
Jaxx4Fun · Dec 14, 2023 · 9c6bdcf · 9c6bdcf
1 parent 1ea66c3
commit 9c6bdcf
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 5 deletions.
diff --git a/apis/apps/v1alpha1/componentdefinition_types.go b/apis/apps/v1alpha1/componentdefinition_types.go
@@ -299,9 +299,8 @@ type SystemAccount struct {
 type RoleArbitrator string
 
 const (
-	ExternalRoleArbitrator   RoleArbitrator = "External"
-	KubeBlocksRoleArbitrator RoleArbitrator = "KubeBlocks"
-	LorryRoleArbitrator      RoleArbitrator = "Lorry"
+	ExternalRoleArbitrator RoleArbitrator = "External"
+	LorryRoleArbitrator    RoleArbitrator = "Lorry"
 )
 
 // ReplicaRole represents a role that can be assumed by a component instance.

diff --git a/controllers/apps/transformer_component_status.go b/controllers/apps/transformer_component_status.go
@@ -505,7 +505,7 @@ func (r *componentStatusHandler) updateComponentStatus(phaseTransitionMsg string
 // In the future, there is a need for a better design to replace this kind of workaround.
 func (r *componentStatusHandler) updatePrimaryIndex() error {
 	// TODO(xingran): consider if there are alternative ways to determine whether it is necessary to specify primary info in the Controller
-	if r.synthesizeComp.RoleArbitrator == nil || *r.synthesizeComp.RoleArbitrator != appsv1alpha1.KubeBlocksRoleArbitrator {
+	if r.synthesizeComp.RoleArbitrator == nil || *r.synthesizeComp.RoleArbitrator != appsv1alpha1.LorryRoleArbitrator {
 		return nil
 	}
 	podList, err := component.ListPodOwnedByComponent(r.reqCtx.Ctx, r.cli, r.cluster.Namespace, constant.GetComponentWellKnownLabels(r.cluster.Name, r.synthesizeComp.Name))

diff --git a/pkg/controller/component/component_definition_convertor.go b/pkg/controller/component/component_definition_convertor.go
@@ -451,7 +451,7 @@ func (c *compDefRoleArbitratorConvertor) convert(args ...any) (any, error) {
 
 	// TODO(xingran): it is hacky, should be refactored
 	if clusterCompDef.WorkloadType == appsv1alpha1.Replication && clusterCompDef.CharacterType == constant.RedisCharacterType {
-		roleArbitrator := appsv1alpha1.KubeBlocksRoleArbitrator
+		roleArbitrator := appsv1alpha1.LorryRoleArbitrator
 		return &roleArbitrator, nil
 	}