k8s mode fix
diff --git a/conf/dubbo-cp.yaml b/conf/dubbo-cp.yaml
index bf79fc8..d0d6bbb 100644
--- a/conf/dubbo-cp.yaml
+++ b/conf/dubbo-cp.yaml
@@ -16,9 +16,10 @@
# 可选 k8s half universal
deploy_mode: k8s
# mode: test
+mode: zone
multizone:
zone:
- globalAddress: grpc://127.0.0.1:8988
+ globalAddress: grpc://127.0.0.1:8080
runtime:
kubernetes:
admissionServer:
diff --git a/pkg/config/multizone/multicluster.go b/pkg/config/multizone/multicluster.go
index 3aecd43..57b243a 100644
--- a/pkg/config/multizone/multicluster.go
+++ b/pkg/config/multizone/multicluster.go
@@ -53,8 +53,16 @@
func DefaultGlobalConfig() *GlobalConfig {
return &GlobalConfig{
DDS: &DdsServerConfig{
- GrpcPort: 5685,
- RefreshInterval: config_types.Duration{Duration: 1 * time.Second},
+ GrpcPort: 5685,
+ RefreshInterval: config_types.Duration{Duration: 1 * time.Second},
+ ZoneInsightFlushInterval: config_types.Duration{Duration: 10 * time.Second},
+ TlsEnabled: false,
+ MaxMsgSize: 10 * 1024 * 1024,
+ MsgSendTimeout: config_types.Duration{Duration: 60 * time.Second},
+ TlsMinVersion: "TLSv1_2",
+ TlsCipherSuites: []string{},
+ NackBackoff: config_types.Duration{Duration: 5 * time.Second},
+ DisableSOTW: false,
},
}
}
diff --git a/pkg/dds/mux/client.go b/pkg/dds/mux/client.go
index 5e12d4c..4723ce5 100644
--- a/pkg/dds/mux/client.go
+++ b/pkg/dds/mux/client.go
@@ -143,7 +143,7 @@
func (c *client) startGlobalToZoneSync(ctx context.Context, log logr.Logger, conn *grpc.ClientConn, errorCh chan error) {
kdsClient := mesh_proto.NewDDSSyncServiceClient(conn)
log = log.WithValues("rpc", "global-to-zone")
- log.Info("initializing Kuma Discovery Service (KDS) stream for global to zone sync of resources with delta xDS")
+ log.Info("initializing Dubbo Discovery Service (DDS) stream for global to zone sync of resources with delta xDS")
stream, err := kdsClient.GlobalToZoneSync(ctx)
if err != nil {
errorCh <- err
@@ -157,7 +157,7 @@
func (c *client) startZoneToGlobalSync(ctx context.Context, log logr.Logger, conn *grpc.ClientConn, errorCh chan error) {
kdsClient := mesh_proto.NewDDSSyncServiceClient(conn)
log = log.WithValues("rpc", "zone-to-global")
- log.Info("initializing Kuma Discovery Service (KDS) stream for zone to global sync of resources with delta xDS")
+ log.Info("initializing Dubbo Discovery Service (DDS) stream for zone to global sync of resources with delta xDS")
stream, err := kdsClient.ZoneToGlobalSync(ctx)
if err != nil {
errorCh <- err