Skip to content

refactor(core): select discovery backend from configured type #718

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dsx137 merged 2 commits into from
Jul 22, 2026
Merged

refactor(core): select discovery backend from configured type #718

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c62fb36
fix(core): select discovery backend from configured type
dsx137 Jul 21, 2026
60d2030
test(core): remove discovery registry regression test
dsx137 Jul 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 20 additions & 4 deletions pkg/common/kdisc/discoveryregister.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
package kdisc

import (
"strings"
"time"

"github.com/openimsdk/chat/pkg/common/config"
"github.com/openimsdk/tools/discovery"
"github.com/openimsdk/tools/discovery/etcd"
"github.com/openimsdk/tools/discovery/kubernetes"
"github.com/openimsdk/tools/errs"
"google.golang.org/grpc"
)

const (
Expand All @@ -32,11 +34,25 @@ const (

// NewDiscoveryRegister creates a new service discovery and registry client based on the provided environment type.
func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string, watchNames []string) (discovery.SvcDiscoveryRegistry, error) {
if runtimeEnv == KUBERNETESCONST {
return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, watchNames)
discoveryType := discovery.Enable
if discoveryType == "" && runtimeEnv == KUBERNETESCONST {
discoveryType = KUBERNETESCONST
}
if discoveryType == KUBERNETESCONST && runtimeEnv != KUBERNETESCONST {
return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
}

switch discovery.Enable {
switch discoveryType {
case KUBERNETESCONST:
for i := range watchNames {
watchNames[i] = strings.Split(watchNames[i], ":")[0]
}
return kubernetes.NewConnManager(discovery.Kubernetes.Namespace, watchNames,
grpc.WithDefaultCallOptions(
grpc.MaxCallSendMsgSize(1024*1024*20),
),
grpc.WithDefaultServiceConfig(`{"loadBalancingPolicy":"round_robin"}`),
)
case ETCDCONST:
return etcd.NewSvcDiscoveryRegistry(
discovery.Etcd.RootDirectory,
Expand All @@ -46,6 +62,6 @@ func NewDiscoveryRegister(discovery *config.Discovery, runtimeEnv string, watchN
etcd.WithMaxCallSendMsgSize(20*1024*1024),
etcd.WithUsernameAndPassword(discovery.Etcd.Username, discovery.Etcd.Password))
default:
return nil, errs.New("unsupported discovery type", "type", discovery.Enable).Wrap()
return nil, errs.New("unsupported discovery type", "type", discoveryType).Wrap()
}
}
Loading