This is an automated email from the ASF dual-hosted git repository. liujun pushed a commit to branch refactor-with-go-components-experimental in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
commit 21b8dad6fe062c9302a1499625d0d5bd4ea08456 Merge: d2923751 e8c1ea00 Author: chickenlj <[email protected]> AuthorDate: Wed Jul 19 18:56:36 2023 +0800 Merge branch 'test-0719' into refactor-with-go-components-experimental # Conflicts: # pkg/config/app/dubbo-cp/dubbo-cp.default.yaml # pkg/core/bootstrap/bootstrap.go # pkg/core/runtime/builder.go conf/admin.yml | 32 +++++++++++++++- conf/mock_provider.yml | 28 -------------- pkg/admin/bootstrap.go | 5 +-- pkg/admin/providers/mock/mock_provider.go | 21 ++++++++-- pkg/authority/setup.go | 1 + pkg/config/admin/config.go | 1 + pkg/config/app/dubbo-cp/config.go | 7 +++- pkg/config/app/dubbo-cp/dubbo-cp.default.yaml | 19 +++++++-- pkg/core/election/universal/leaderelection.go | 55 +++++++++++++++++++++++++++ 9 files changed, 126 insertions(+), 43 deletions(-) diff --cc pkg/config/app/dubbo-cp/config.go index 2621bcab,d3f40e49..528d3362 --- a/pkg/config/app/dubbo-cp/config.go +++ b/pkg/config/app/dubbo-cp/config.go @@@ -100,7 -102,7 +102,8 @@@ var DefaultConfig = func() Config IsKubernetesConnected: false, RestConfigQps: 50, RestConfigBurst: 100, + KubeFileConfig: "", }, + Dubbo: dubbogo.RootConfig{}, } } diff --cc pkg/config/app/dubbo-cp/dubbo-cp.default.yaml index e2947caf,f5b31b10..207b614b --- a/pkg/config/app/dubbo-cp/dubbo-cp.default.yaml +++ b/pkg/config/app/dubbo-cp/dubbo-cp.default.yaml @@@ -36,8 -36,20 +36,21 @@@ kube-config in-pod-env: false rest-config-qps: 50 rest-config-burst: 100 + kube-file-config: "" - grpc-server: + grpc-cp-server: plain-server-port: 30060 secure-server-port: 30062 - debug-port: 30070 + debug-port: 30070 + dubbo: + registries: + demoZK: + protocol: zookeeper + address: 127.0.0.1:2181 + protocols: + triple: + name: tri + port: 20000 + provider: + services: + MockServiceServer: + interface: "" # must be compatible with grpc or dubbo-java
