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 b165c47df48705310408955be94d62e3675c974b
Merge: d831f00a b943281e
Author: Ken Liu <[email protected]>
AuthorDate: Wed Apr 10 11:19:03 2024 +0800

    Merge pull request #256 from sjmshsh/feat_fixbug
    
    remove redundant codes

 api/mesh/v1alpha1/dataplane.pb.go                  |  27 +-
 api/mesh/v1alpha1/dataplane.proto                  |   1 +
 api/mesh/v1alpha1/dds.pb.go                        | 817 ++-------------------
 api/mesh/v1alpha1/dds.proto                        | 108 ---
 api/mesh/v1alpha1/dds_grpc.pb.go                   | 229 +-----
 .../v1alpha1/envoy_admin_inter_cp_forward.pb.go    | 106 ---
 .../v1alpha1/envoy_admin_inter_cp_forward.proto    |  13 -
 .../envoy_admin_inter_cp_forward_grpc.pb.go        | 177 -----
 api/mesh/v1alpha1/mapping.pb.go                    |  51 +-
 api/mesh/v1alpha1/mapping.proto                    |   2 +
 api/mesh/v1alpha1/mesh.pb.go                       | 197 ++---
 api/mesh/v1alpha1/mesh.proto                       |   1 +
 api/mesh/v1alpha1/metadata.pb.go                   | 129 ++--
 api/mesh/v1alpha1/metadata.proto                   |   9 +-
 api/mesh/v1alpha1/mux.pb.go                        | 260 -------
 api/mesh/v1alpha1/mux.proto                        |  21 -
 api/mesh/v1alpha1/mux_grpc.pb.go                   | 136 ----
 api/mesh/v1alpha1/selector.pb.go                   | 160 ----
 api/mesh/v1alpha1/selector.proto                   |  11 -
 api/mesh/v1alpha1/zone_ingress.pb.go               |  23 +-
 api/mesh/v1alpha1/zone_ingress.proto               |   2 +
 api/mesh/v1alpha1/zoneegress.pb.go                 |  31 +-
 api/mesh/v1alpha1/zoneegress.proto                 |   4 +-
 api/mesh/v1alpha1/zoneegressoverview.pb.go         | 191 -----
 api/mesh/v1alpha1/zoneegressoverview.proto         |  24 -
 api/mesh/v1alpha1/zoneingress_overview.pb.go       | 192 -----
 api/mesh/v1alpha1/zoneingress_overview.proto       |  23 -
 api/system/v1alpha1/zone_insight.pb.go             |  10 +-
 api/system/v1alpha1/zone_insight.proto             |  10 +-
 app/dubbo-cp/cmd/run.go                            |   5 -
 app/dubboctl/cmd/proxy.go                          |  21 +-
 app/dubboctl/cmd/proxy_context.go                  |   2 +-
 app/dubboctl/cmd/proxy_test.go                     |  15 +-
 app/dubboctl/internal/envoy/envoy.go               |   6 +-
 app/dubboctl/internal/envoy/remote_bootstrap.go    |   6 +-
 deploy/charts/admin/crds/dubbo.io_mappings.yaml    |   2 +-
 deploy/charts/admin/crds/dubbo.io_metadata.yaml    |   2 +-
 docs/multicluster/design.md                        |   1 +
 mk/run.mk                                          |   2 +-
 pkg/config/app/dubbo-cp/config.go                  |   8 +-
 pkg/config/app/dubboctl/proxy_config.go            |   2 +-
 pkg/config/dp-server/config.go                     |  18 +-
 pkg/config/eventbus/config.go                      |   2 +-
 pkg/config/multizone/dds.go                        |  62 +-
 pkg/config/plugins/runtime/k8s/config.go           |   4 +-
 pkg/config/xds/config.go                           |   2 +-
 pkg/core/admin/client.go                           | 191 -----
 pkg/core/admin/dds_client.go                       | 192 -----
 pkg/core/admin/sanitize.go                         |  54 --
 pkg/core/bootstrap/bootstrap.go                    |  28 +-
 .../managers/apis/dataplane/dataplane_manager.go   |   3 +-
 .../resources/apis/mesh/metadata_helpers.go}       |  17 +-
 .../resources/apis/mesh/zz_generated.resources.go  | 261 +------
 pkg/core/runtime/builder.go                        |  15 -
 pkg/core/runtime/runtime.go                        |   7 -
 pkg/core/xds/sockets.go                            |   4 +-
 pkg/dds/context/context.go                         |   9 +-
 pkg/dds/features.go                                |   2 -
 pkg/dds/global/components.go                       |   9 +-
 pkg/dds/mux/client.go                              | 115 +--
 pkg/dds/mux/clientstream.go                        |  74 --
 pkg/dds/mux/server.go                              |   5 -
 pkg/dds/mux/serverstream.go                        |  74 --
 pkg/dds/mux/session.go                             | 191 -----
 pkg/dds/mux/version.go                             |  55 --
 pkg/dds/mux/zone_sync.go                           |   2 +-
 pkg/dds/reconcile/reconciler.go                    |   1 +
 pkg/dds/service/envoy_admin_processor.go           | 186 -----
 pkg/dds/service/envoy_admin_rpcs.go                |  42 --
 pkg/dds/service/server.go                          | 166 +----
 pkg/dds/store/sync.go                              |  13 +-
 pkg/dds/util/resource_test.go                      |   4 +-
 pkg/dds/zone/components.go                         |  13 +-
 pkg/dp-server/server/server.go                     |  94 +--
 pkg/dubbo/components.go                            |   1 +
 pkg/dubbo/metadata/server.go                       |  13 +-
 pkg/dubbo/servicemapping/server.go                 |   2 +-
 pkg/hds/server/server.go                           |   2 -
 pkg/intercp/catalog/catalog.go                     |  89 ---
 pkg/intercp/catalog/config_catalog.go              | 137 ----
 pkg/intercp/catalog/heartbeat_component.go         | 148 ----
 pkg/intercp/catalog/heartbeats.go                  |  57 --
 pkg/intercp/catalog/server.go                      |  64 --
 pkg/intercp/catalog/writer.go                      |  88 ---
 pkg/intercp/client/client.go                       |  71 --
 pkg/intercp/client/pool.go                         | 135 ----
 pkg/intercp/components.go                          |  50 --
 pkg/intercp/envoyadmin/forwarding_dds_client.go    | 215 ------
 pkg/intercp/envoyadmin/server.go                   | 116 ---
 pkg/intercp/server/server.go                       | 120 ---
 pkg/plugins/common/zookeeper/connection.go         |  34 -
 pkg/plugins/common/zookeeper/zk_listener.go        |  62 --
 .../k8s/native/api/v1alpha1/zz_generated.mesh.go   |  12 +-
 pkg/plugins/resources/traditional/store.go         |   2 +-
 .../runtime/k8s/controllers/inbound_converter.go   |  10 +-
 .../runtime/k8s/controllers/pod_controller.go      |  12 +-
 pkg/plugins/runtime/k8s/metadata/annotations.go    |   8 +-
 .../runtime/k8s/webhooks/service_validator.go      |   2 +-
 pkg/plugins/runtime/k8s/webhooks/validation.go     |  10 +-
 pkg/util/xds/stats_callbacks.go                    |  37 -
 pkg/xds/bootstrap/generator.go                     |   2 +-
 pkg/xds/bootstrap/template_v3.go                   |   2 +-
 pkg/xds/server/components.go                       |   4 +-
 test/app/provider/deployment.yaml                  |   2 +-
 tools/xds-client/main.go                           |   4 +-
 105 files changed, 570 insertions(+), 5893 deletions(-)

Reply via email to