Skip to content

Commit

Permalink
chore: adapt lorry for oceanbase replication change into one component (
Browse files Browse the repository at this point in the history
#7838)

(cherry picked from commit e35b229)
  • Loading branch information
xuriwuyun committed Jul 19, 2024
1 parent 9ce76de commit 99aea73
Showing 1 changed file with 7 additions and 8 deletions.
15 changes: 7 additions & 8 deletions pkg/lorry/dcs/k8s.go
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ import (

appsv1alpha1 "github.com/apecloud/kubeblocks/apis/apps/v1alpha1"
"github.com/apecloud/kubeblocks/pkg/constant"
"github.com/apecloud/kubeblocks/pkg/lorry/engines/models"
k8s "github.com/apecloud/kubeblocks/pkg/lorry/util/kubernetes"
viper "github.com/apecloud/kubeblocks/pkg/viperx"
)
Expand Down Expand Up @@ -101,14 +100,14 @@ func NewKubernetesStore() (*KubernetesStore, error) {
return nil, errors.New("KB_NAMESPACE must be set")
}

characterType := viper.GetString(constant.KBEnvCharacterType)
if viper.IsSet(constant.KBEnvBuiltinHandler) {
characterType = viper.GetString(constant.KBEnvBuiltinHandler)
}
isLeaderClusterWide := false
if characterType == string(models.Oceanbase) {
isLeaderClusterWide = true
}
// characterType := viper.GetString(constant.KBEnvCharacterType)
// if viper.IsSet(constant.KBEnvBuiltinHandler) {
// characterType = viper.GetString(constant.KBEnvBuiltinHandler)
// }
// if characterType == string(models.Oceanbase) {
// isLeaderClusterWide = true
// }

store := &KubernetesStore{
ctx: ctx,
Expand Down

0 comments on commit 99aea73

Please sign in to comment.