You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2024/06/20 03:48:31 UTC
(dubbo-kubernetes) 03/04: Merge branch 'master' of https://github.com/apache/dubbo-kubernetes
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo-kubernetes.git
commit e2f5ca5015f4d25c1d9c79eea45ff428539593f8
Merge: 2c1b6ac5 8b60acc0
Author: chickenlj <ke...@gmail.com>
AuthorDate: Thu Jun 20 11:41:17 2024 +0800
Merge branch 'master' of https://github.com/apache/dubbo-kubernetes
.github/workflows/ci.yml | 37 +-
.licenserc.yaml | 6 +
Makefile | 15 +
api/mesh/v1alpha1/condition_route.pb.go | 705 ++++-
api/mesh/v1alpha1/condition_route.proto | 62 +-
api/mesh/v1alpha1/condition_route_helper.go | 283 ++
api/mesh/v1alpha1/dds.pb.go | 102 +-
api/mesh/v1alpha1/dds.proto | 5 -
api/mesh/v1alpha1/dds_grpc.pb.go | 118 -
api/mesh/v1alpha1/dynamic_config.pb.go | 125 +-
api/mesh/v1alpha1/dynamic_config.proto | 6 +-
api/mesh/v1alpha1/dynamic_config_helper.go | 44 +
api/mesh/v1alpha1/mapping.pb.go | 417 +--
api/mesh/v1alpha1/mapping.proto | 41 -
api/mesh/v1alpha1/mapping_grpc.pb.go | 192 --
api/mesh/v1alpha1/mds.pb.go | 806 ++++++
api/mesh/v1alpha1/{mapping.proto => mds.proto} | 48 +-
api/mesh/v1alpha1/mds_grpc.pb.go | 295 +++
api/mesh/v1alpha1/metadata.pb.go | 489 +---
api/mesh/v1alpha1/metadata.proto | 32 -
api/mesh/v1alpha1/metadata_grpc.pb.go | 173 --
api/mesh/v1alpha1/tag_route.pb.go | 64 +-
api/mesh/v1alpha1/tag_route.proto | 3 +
...{dynamic_config_helper.go => tag_route_help.go} | 49 +-
app/dubbo-cp/cmd/run.go | 27 +-
app/dubboctl/cmd/proxy.go | 1 -
app/dubboctl/cmd/proxy_test.go | 271 --
app/dubboctl/internal/docker/creds/credentials.go | 42 +-
app/dubboctl/internal/dubbo/templates_embedded.go | 1 +
app/dubboctl/internal/kube/client_test.go | 256 --
app/dubboctl/internal/kube/component_test.go | 154 --
conf/dubbo-cp.yaml | 2 +-
deploy/charts/admin/Chart.yaml | 12 +-
deploy/kubernetes/prometheus.yaml | 735 +++++-
generate/templates/main.go | 11 +-
generate/zz_filesystem_generated.go | 2768 ++++++++++++++++----
go.mod | 2 +-
mk/check.mk | 5 +-
mk/generate.mk | 12 +-
pkg/admin/constants/constants.go | 5 +
pkg/admin/handler/application.go | 415 ++-
pkg/admin/handler/instance.go | 292 ++-
pkg/admin/handler/overview.go | 7 +-
pkg/admin/handler/search.go | 17 +-
pkg/admin/handler/service.go | 456 +++-
pkg/admin/handler/service_testing.go | 2 +
pkg/admin/handler/service_testing_impl.go | 5 +-
pkg/admin/handler/traffic_condition_rule.go | 303 +++
pkg/admin/handler/traffic_configurator.go | 200 ++
pkg/admin/handler/traffic_tag_rule.go | 205 ++
pkg/admin/model/application.go | 68 +-
pkg/admin/model/instance.go | 26 +-
pkg/admin/model/service.go | 161 ++
pkg/admin/model/testing.go | 17 +
pkg/admin/model/traffic_condition_rule.go | 303 +++
pkg/admin/model/traffic_configurator.go | 236 ++
pkg/admin/model/traffic_tag_rule.go | 93 +
pkg/admin/server/router.go | 77 +-
pkg/admin/server/server.go | 8 +-
pkg/admin/service/application.go | 21 +-
pkg/admin/service/instance.go | 12 +-
pkg/admin/service/service.go | 122 +
pkg/admin/util/reflection/reflection.go | 5 +
pkg/admin/util/reflection/reflection_test.go | 592 -----
pkg/admin/util/reflection/testdata/api/server.go | 119 -
.../util/reflection/testdata/proto/greet.pb.go | 616 -----
.../util/reflection/testdata/proto/greet.proto | 44 -
.../testdata/proto/grpc_gen/greet_grpc.pb.go | 315 ---
.../proto/triple_gen/greettriple/greet.triple.go | 376 ---
pkg/config/plugins/runtime/k8s/config.go | 5 -
.../xds/bootstrap/types/bootstrap_request.go | 17 +
pkg/core/consts/const.go | 15 +
pkg/core/dns/lookup/cache.go | 17 +
pkg/core/dns/lookup/cache_suite_test.go | 17 +
pkg/core/dns/lookup/cache_test.go | 17 +
pkg/core/dns/lookup/interface.go | 17 +
pkg/core/governance/governance_config.go | 21 +
pkg/core/governance/governance_config_mock.go | 8 +
pkg/core/logger/log.go | 2 +
.../managers/apis/dataplane/dataplane_manager.go | 15 +-
pkg/core/registry/mapping.go | 17 +-
pkg/core/registry/metadata_instance.go | 3 +
pkg/core/registry/registry.go | 4 +-
pkg/core/resources/manager/manager_test.go | 4 +-
pkg/core/resources/model/resource.go | 7 -
pkg/core/user/context.go | 17 +
pkg/core/user/user.go | 17 +
pkg/core/xds/sockets.go | 17 +
pkg/dubbo/servicemapping/register_request.go | 58 -
pkg/dubbo/servicemapping/resource_meta.go | 65 -
pkg/dubbo/servicemapping/server.go | 432 ---
pkg/{dubbo => mds}/client/stream.go | 4 +-
pkg/{dubbo => mds}/client/sync_client.go | 0
pkg/{dubbo => mds}/components.go | 33 +-
pkg/{dubbo => mds}/pusher/interface.go | 0
pkg/{dubbo => mds}/pusher/pushed_items.go | 0
pkg/{dubbo => mds}/pusher/pusher.go | 0
.../pusher/resource_changed_callbacks.go | 0
pkg/{dubbo => mds}/pusher/revision.go | 0
pkg/mds/server/debounce.go | 86 +
pkg/mds/server/register_request.go | 205 ++
.../metadata => mds/server}/resource_meta.go | 2 +-
pkg/{dubbo/metadata => mds/server}/server.go | 400 +--
pkg/plugins/resources/k8s/store.go | 137 +-
pkg/plugins/resources/k8s/store_test.go | 64 +
pkg/plugins/resources/k8s/util/bitset.go | 72 +
.../resources/k8s/util/bitset_test.go} | 61 +-
pkg/plugins/resources/traditional/store.go | 213 +-
pkg/plugins/resources/traditional/utils.go | 21 +
pkg/plugins/runtime/k8s/plugin.go | 21 +
pkg/proxy/cgroups/cgroups.go | 17 +
pkg/util/concurrent/debouncer.go | 96 +
pkg/util/maps/sorted_keys_test.go | 17 +
pkg/util/os/limits_test.go | 17 +
pkg/util/protocol/protocol.go | 17 +
pkg/util/sets/set.go | 297 +++
pkg/util/sets/set_test.go | 392 +++
pkg/util/slices/slices.go | 315 +++
pkg/util/slices/slices_test.go | 916 +++++++
pkg/xds/bootstrap/generator.go | 17 +
pkg/xds/context/aggregate_mesh_context.go | 17 +
pkg/xds/envoy/imports.go | 17 +
pkg/xds/envoy/types.go | 2 -
pkg/xds/generator/zoneproxy/destinations.go | 17 +
pkg/xds/generator/zoneproxy/generator.go | 17 +
pkg/xds/ingress/dataplane.go | 17 +
pkg/xds/ingress/outbound.go | 17 +
pkg/xds/ingress/router.go | 17 +
templates/go/common/api/api.proto | 10 +-
templates/go/common/go.mod | 120 +-
templates/go/common/go.sum | 179 ++
test/control-plane/cp.yaml | 35 +-
tools/dds-client/main.go | 180 ++
tools/dds-client/stream/client.go | 181 ++
134 files changed, 12542 insertions(+), 6030 deletions(-)
diff --cc conf/dubbo-cp.yaml
index 74d0f92d,91f90f25..89f188f9
--- a/conf/dubbo-cp.yaml
+++ b/conf/dubbo-cp.yaml
@@@ -14,16 -14,9 +14,16 @@@
# limitations under the License.
# 可选 k8s half universal
- deploy_mode: universal
+ deploy_mode: k8s
#mode: test
mode: zone
+#store:
+# traditional:
+# config_center: nacos://localhost:8848
+# registry:
+# address: nacos://localhost:8848
+# metadata_report:
+# address: nacos://localhost:8848
#multizone:
# zone:
# globalAddress: grpc://127.0.0.1:5685