diff --git a/BUILD b/BUILD
index 791d2c29c76..8f343f369b8 100644
--- a/BUILD
+++ b/BUILD
@@ -305,12 +305,7 @@ grpc_cc_library(
standalone = True,
deps = [
"grpc_common",
- "grpc_lb_policy_cds",
- "grpc_lb_policy_eds",
"grpc_lb_policy_grpclb",
- "grpc_lb_policy_lrs",
- "grpc_lb_policy_xds_routing",
- "grpc_resolver_xds",
],
)
@@ -326,12 +321,12 @@ grpc_cc_library(
deps = [
"grpc_authorization_engine",
"grpc_common",
- "grpc_lb_policy_cds_secure",
- "grpc_lb_policy_eds_secure",
+ "grpc_lb_policy_cds",
+ "grpc_lb_policy_eds",
"grpc_lb_policy_grpclb_secure",
- "grpc_lb_policy_lrs_secure",
+ "grpc_lb_policy_lrs",
"grpc_lb_policy_xds_routing",
- "grpc_resolver_xds_secure",
+ "grpc_resolver_xds",
"grpc_secure",
"grpc_transport_chttp2_client_secure",
"grpc_transport_chttp2_server_secure",
@@ -1307,35 +1302,10 @@ grpc_cc_library(
srcs = [
"src/core/ext/xds/xds_api.cc",
"src/core/ext/xds/xds_bootstrap.cc",
- "src/core/ext/xds/xds_channel.cc",
- "src/core/ext/xds/xds_client.cc",
- "src/core/ext/xds/xds_client_stats.cc",
- ],
- hdrs = [
- "src/core/ext/xds/xds_channel.h",
- "src/core/ext/xds/xds_channel_args.h",
- "src/core/ext/xds/xds_client.h",
- ],
- language = "c++",
- deps = [
- "envoy_ads_upb",
- "grpc_base",
- "grpc_client_channel",
- "grpc_xds_api_header",
- ],
-)
-
-grpc_cc_library(
- name = "grpc_xds_client_secure",
- srcs = [
- "src/core/ext/xds/xds_api.cc",
- "src/core/ext/xds/xds_bootstrap.cc",
- "src/core/ext/xds/xds_channel_secure.cc",
"src/core/ext/xds/xds_client.cc",
"src/core/ext/xds/xds_client_stats.cc",
],
hdrs = [
- "src/core/ext/xds/xds_channel.h",
"src/core/ext/xds/xds_channel_args.h",
"src/core/ext/xds/xds_client.h",
],
@@ -1362,19 +1332,6 @@ grpc_cc_library(
],
)
-grpc_cc_library(
- name = "grpc_lb_policy_cds_secure",
- srcs = [
- "src/core/ext/filters/client_channel/lb_policy/xds/cds.cc",
- ],
- language = "c++",
- deps = [
- "grpc_base",
- "grpc_client_channel",
- "grpc_xds_client_secure",
- ],
-)
-
grpc_cc_library(
name = "grpc_lb_policy_eds",
srcs = [
@@ -1395,26 +1352,6 @@ grpc_cc_library(
],
)
-grpc_cc_library(
- name = "grpc_lb_policy_eds_secure",
- srcs = [
- "src/core/ext/filters/client_channel/lb_policy/xds/eds.cc",
- ],
- hdrs = [
- "src/core/ext/filters/client_channel/lb_policy/xds/xds.h",
- ],
- external_deps = [
- "absl/strings",
- ],
- language = "c++",
- deps = [
- "grpc_base",
- "grpc_client_channel",
- "grpc_lb_address_filtering",
- "grpc_xds_client_secure",
- ],
-)
-
grpc_cc_library(
name = "grpc_lb_policy_lrs",
srcs = [
@@ -1428,19 +1365,6 @@ grpc_cc_library(
],
)
-grpc_cc_library(
- name = "grpc_lb_policy_lrs_secure",
- srcs = [
- "src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc",
- ],
- language = "c++",
- deps = [
- "grpc_base",
- "grpc_client_channel",
- "grpc_xds_client_secure",
- ],
-)
-
grpc_cc_library(
name = "grpc_lb_policy_xds_routing",
srcs = [
@@ -1754,19 +1678,6 @@ grpc_cc_library(
],
)
-grpc_cc_library(
- name = "grpc_resolver_xds_secure",
- srcs = [
- "src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc",
- ],
- language = "c++",
- deps = [
- "grpc_base",
- "grpc_client_channel",
- "grpc_xds_client_secure",
- ],
-)
-
grpc_cc_library(
name = "grpc_secure",
srcs = [
diff --git a/BUILD.gn b/BUILD.gn
index 320027a9057..c297aaef984 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -546,9 +546,7 @@ config("grpc_config") {
"src/core/ext/xds/xds_api.h",
"src/core/ext/xds/xds_bootstrap.cc",
"src/core/ext/xds/xds_bootstrap.h",
- "src/core/ext/xds/xds_channel.h",
"src/core/ext/xds/xds_channel_args.h",
- "src/core/ext/xds/xds_channel_secure.cc",
"src/core/ext/xds/xds_client.cc",
"src/core/ext/xds/xds_client.h",
"src/core/ext/xds/xds_client_stats.cc",
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 25a08ece555..2fa21f18a34 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1594,7 +1594,6 @@ add_library(grpc
src/core/ext/upb-generated/validate/validate.upb.c
src/core/ext/xds/xds_api.cc
src/core/ext/xds/xds_bootstrap.cc
- src/core/ext/xds/xds_channel_secure.cc
src/core/ext/xds/xds_client.cc
src/core/ext/xds/xds_client_stats.cc
src/core/lib/avl/avl.cc
@@ -2123,10 +2122,6 @@ add_library(grpc_unsecure
src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
- src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
- src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
- src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
- src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
src/core/ext/filters/client_channel/lb_policy_registry.cc
src/core/ext/filters/client_channel/local_subchannel_pool.cc
src/core/ext/filters/client_channel/proxy_mapper_registry.cc
@@ -2145,7 +2140,6 @@ add_library(grpc_unsecure
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
src/core/ext/filters/client_channel/resolver_registry.cc
src/core/ext/filters/client_channel/resolver_result_parsing.cc
src/core/ext/filters/client_channel/resolving_lb_policy.cc
@@ -2201,61 +2195,6 @@ add_library(grpc_unsecure
src/core/ext/transport/chttp2/transport/writing.cc
src/core/ext/transport/inproc/inproc_plugin.cc
src/core/ext/transport/inproc/inproc_transport.cc
- src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
- src/core/ext/upb-generated/envoy/annotations/resource.upb.c
- src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
- src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
- src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
- src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
- src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
- src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
- src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
- src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
- src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
- src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
- src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
- src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
- src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
- src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
- src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
- src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
- src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
- src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c
- src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
- src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
- src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c
- src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c
- src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
- src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c
- src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
- src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
- src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
- src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
- src/core/ext/upb-generated/envoy/type/v3/http.upb.c
- src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
- src/core/ext/upb-generated/envoy/type/v3/range.upb.c
- src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
src/core/ext/upb-generated/gogoproto/gogo.upb.c
src/core/ext/upb-generated/google/api/annotations.upb.c
src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
@@ -2270,17 +2209,8 @@ add_library(grpc_unsecure
src/core/ext/upb-generated/google/rpc/status.upb.c
src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
- src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
- src/core/ext/upb-generated/udpa/annotations/status.upb.c
- src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
src/core/ext/upb-generated/validate/validate.upb.c
- src/core/ext/xds/xds_api.cc
- src/core/ext/xds/xds_bootstrap.cc
- src/core/ext/xds/xds_channel.cc
- src/core/ext/xds/xds_client.cc
- src/core/ext/xds/xds_client_stats.cc
src/core/lib/avl/avl.cc
src/core/lib/backoff/backoff.cc
src/core/lib/channel/channel_args.cc
diff --git a/Makefile b/Makefile
index bd60397d67e..9519ad6a667 100644
--- a/Makefile
+++ b/Makefile
@@ -2197,7 +2197,6 @@ LIBGRPC_SRC = \
src/core/ext/upb-generated/validate/validate.upb.c \
src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_bootstrap.cc \
- src/core/ext/xds/xds_channel_secure.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_stats.cc \
src/core/lib/avl/avl.cc \
@@ -2593,10 +2592,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/filters/client_channel/lb_policy/priority/priority.cc \
src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc \
src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc \
- src/core/ext/filters/client_channel/lb_policy/xds/cds.cc \
- src/core/ext/filters/client_channel/lb_policy/xds/eds.cc \
- src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc \
- src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc \
src/core/ext/filters/client_channel/lb_policy_registry.cc \
src/core/ext/filters/client_channel/local_subchannel_pool.cc \
src/core/ext/filters/client_channel/proxy_mapper_registry.cc \
@@ -2615,7 +2610,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc \
src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc \
src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc \
- src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc \
src/core/ext/filters/client_channel/resolver_registry.cc \
src/core/ext/filters/client_channel/resolver_result_parsing.cc \
src/core/ext/filters/client_channel/resolving_lb_policy.cc \
@@ -2671,61 +2665,6 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/transport/chttp2/transport/writing.cc \
src/core/ext/transport/inproc/inproc_plugin.cc \
src/core/ext/transport/inproc/inproc_transport.cc \
- src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c \
- src/core/ext/upb-generated/envoy/annotations/resource.upb.c \
- src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c \
- src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c \
- src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c \
- src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c \
- src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c \
- src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c \
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c \
- src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c \
- src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c \
- src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c \
- src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c \
- src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c \
- src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c \
- src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c \
- src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c \
- src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c \
- src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c \
- src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c \
- src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c \
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c \
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c \
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c \
- src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c \
- src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c \
- src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c \
- src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c \
- src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c \
- src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c \
- src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c \
- src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c \
- src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c \
- src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c \
- src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c \
- src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c \
- src/core/ext/upb-generated/envoy/type/v3/http.upb.c \
- src/core/ext/upb-generated/envoy/type/v3/percent.upb.c \
- src/core/ext/upb-generated/envoy/type/v3/range.upb.c \
- src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c \
src/core/ext/upb-generated/gogoproto/gogo.upb.c \
src/core/ext/upb-generated/google/api/annotations.upb.c \
src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c \
@@ -2740,17 +2679,8 @@ LIBGRPC_UNSECURE_SRC = \
src/core/ext/upb-generated/google/rpc/status.upb.c \
src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c \
src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c \
- src/core/ext/upb-generated/udpa/annotations/migrate.upb.c \
- src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c \
- src/core/ext/upb-generated/udpa/annotations/status.upb.c \
- src/core/ext/upb-generated/udpa/annotations/versioning.upb.c \
src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c \
src/core/ext/upb-generated/validate/validate.upb.c \
- src/core/ext/xds/xds_api.cc \
- src/core/ext/xds/xds_bootstrap.cc \
- src/core/ext/xds/xds_channel.cc \
- src/core/ext/xds/xds_client.cc \
- src/core/ext/xds/xds_client_stats.cc \
src/core/lib/avl/avl.cc \
src/core/lib/backoff/backoff.cc \
src/core/lib/channel/channel_args.cc \
@@ -4781,12 +4711,79 @@ ifneq ($(OPENSSL_DEP),)
# installing headers to their final destination on the drive. We need this
# otherwise parallel compilation will fail if a source is compiled first.
src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_channel_secure.cc: $(OPENSSL_DEP)
+src/core/ext/filters/client_channel/lb_policy/xds/cds.cc: $(OPENSSL_DEP)
+src/core/ext/filters/client_channel/lb_policy/xds/eds.cc: $(OPENSSL_DEP)
+src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc: $(OPENSSL_DEP)
+src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc: $(OPENSSL_DEP)
+src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc: $(OPENSSL_DEP)
src/core/ext/transport/chttp2/client/secure/secure_channel_create.cc: $(OPENSSL_DEP)
src/core/ext/transport/chttp2/server/secure/server_secure_chttp2.cc: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/annotations/resource.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/v3/http.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/v3/percent.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/v3/range.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/src/proto/grpc/gcp/altscontext.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/src/proto/grpc/gcp/handshaker.upb.c: $(OPENSSL_DEP)
src/core/ext/upb-generated/src/proto/grpc/gcp/transport_security_common.upb.c: $(OPENSSL_DEP)
-src/core/ext/xds/xds_channel_secure.cc: $(OPENSSL_DEP)
+src/core/ext/upb-generated/udpa/annotations/migrate.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/udpa/annotations/status.upb.c: $(OPENSSL_DEP)
+src/core/ext/upb-generated/udpa/annotations/versioning.upb.c: $(OPENSSL_DEP)
+src/core/ext/xds/xds_api.cc: $(OPENSSL_DEP)
+src/core/ext/xds/xds_bootstrap.cc: $(OPENSSL_DEP)
+src/core/ext/xds/xds_client.cc: $(OPENSSL_DEP)
+src/core/ext/xds/xds_client_stats.cc: $(OPENSSL_DEP)
src/core/lib/http/httpcli_security_connector.cc: $(OPENSSL_DEP)
src/core/lib/security/authorization/authorization_engine.cc: $(OPENSSL_DEP)
src/core/lib/security/authorization/evaluate_args.cc: $(OPENSSL_DEP)
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
index 887c25aa814..750fa358603 100644
--- a/build_autogenerated.yaml
+++ b/build_autogenerated.yaml
@@ -536,7 +536,6 @@ libs:
- src/core/ext/upb-generated/validate/validate.upb.h
- src/core/ext/xds/xds_api.h
- src/core/ext/xds/xds_bootstrap.h
- - src/core/ext/xds/xds_channel.h
- src/core/ext/xds/xds_channel_args.h
- src/core/ext/xds/xds_client.h
- src/core/ext/xds/xds_client_stats.h
@@ -942,7 +941,6 @@ libs:
- src/core/ext/upb-generated/validate/validate.upb.c
- src/core/ext/xds/xds_api.cc
- src/core/ext/xds/xds_bootstrap.cc
- - src/core/ext/xds/xds_channel_secure.cc
- src/core/ext/xds/xds_client.cc
- src/core/ext/xds/xds_client_stats.cc
- src/core/lib/avl/avl.cc
@@ -1351,7 +1349,6 @@ libs:
- src/core/ext/filters/client_channel/lb_policy/grpclb/grpclb_client_stats.h
- src/core/ext/filters/client_channel/lb_policy/grpclb/load_balancer_api.h
- src/core/ext/filters/client_channel/lb_policy/subchannel_list.h
- - src/core/ext/filters/client_channel/lb_policy/xds/xds.h
- src/core/ext/filters/client_channel/lb_policy_factory.h
- src/core/ext/filters/client_channel/lb_policy_registry.h
- src/core/ext/filters/client_channel/local_subchannel_pool.h
@@ -1410,61 +1407,6 @@ libs:
- src/core/ext/transport/chttp2/transport/stream_map.h
- src/core/ext/transport/chttp2/transport/varint.h
- src/core/ext/transport/inproc/inproc_transport.h
- - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.h
- - src/core/ext/upb-generated/envoy/annotations/resource.upb.h
- - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.h
- - src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.h
- - src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.h
- - src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.h
- - src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.h
- - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.h
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.h
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.h
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.h
- - src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.h
- - src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.h
- - src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.h
- - src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.h
- - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.h
- - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.h
- - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.h
- - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.h
- - src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.h
- - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.h
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.h
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.h
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.h
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.h
- - src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.h
- - src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.h
- - src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.h
- - src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.h
- - src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.h
- - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.h
- - src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.h
- - src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.h
- - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.h
- - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.h
- - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.h
- - src/core/ext/upb-generated/envoy/type/v3/http.upb.h
- - src/core/ext/upb-generated/envoy/type/v3/percent.upb.h
- - src/core/ext/upb-generated/envoy/type/v3/range.upb.h
- - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.h
- src/core/ext/upb-generated/gogoproto/gogo.upb.h
- src/core/ext/upb-generated/google/api/annotations.upb.h
- src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.h
@@ -1479,18 +1421,8 @@ libs:
- src/core/ext/upb-generated/google/rpc/status.upb.h
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.h
- src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.h
- - src/core/ext/upb-generated/udpa/annotations/migrate.upb.h
- - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.h
- - src/core/ext/upb-generated/udpa/annotations/status.upb.h
- - src/core/ext/upb-generated/udpa/annotations/versioning.upb.h
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.h
- src/core/ext/upb-generated/validate/validate.upb.h
- - src/core/ext/xds/xds_api.h
- - src/core/ext/xds/xds_bootstrap.h
- - src/core/ext/xds/xds_channel.h
- - src/core/ext/xds/xds_channel_args.h
- - src/core/ext/xds/xds_client.h
- - src/core/ext/xds/xds_client_stats.h
- src/core/lib/avl/avl.h
- src/core/lib/backoff/backoff.h
- src/core/lib/channel/channel_args.h
@@ -1663,10 +1595,6 @@ libs:
- src/core/ext/filters/client_channel/lb_policy/priority/priority.cc
- src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc
- src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc
- - src/core/ext/filters/client_channel/lb_policy/xds/cds.cc
- - src/core/ext/filters/client_channel/lb_policy/xds/eds.cc
- - src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc
- - src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc
- src/core/ext/filters/client_channel/lb_policy_registry.cc
- src/core/ext/filters/client_channel/local_subchannel_pool.cc
- src/core/ext/filters/client_channel/proxy_mapper_registry.cc
@@ -1685,7 +1613,6 @@ libs:
- src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc
- src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc
- src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc
- - src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc
- src/core/ext/filters/client_channel/resolver_registry.cc
- src/core/ext/filters/client_channel/resolver_result_parsing.cc
- src/core/ext/filters/client_channel/resolving_lb_policy.cc
@@ -1741,61 +1668,6 @@ libs:
- src/core/ext/transport/chttp2/transport/writing.cc
- src/core/ext/transport/inproc/inproc_plugin.cc
- src/core/ext/transport/inproc/inproc_transport.cc
- - src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c
- - src/core/ext/upb-generated/envoy/annotations/resource.upb.c
- - src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c
- - src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c
- - src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c
- - src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c
- - src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c
- - src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c
- - src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c
- - src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c
- - src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c
- - src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c
- - src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c
- - src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c
- - src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c
- - src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c
- - src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c
- - src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c
- - src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c
- - src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c
- - src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c
- - src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c
- - src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c
- - src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c
- - src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c
- - src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c
- - src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c
- - src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c
- - src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c
- - src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c
- - src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c
- - src/core/ext/upb-generated/envoy/type/v3/http.upb.c
- - src/core/ext/upb-generated/envoy/type/v3/percent.upb.c
- - src/core/ext/upb-generated/envoy/type/v3/range.upb.c
- - src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c
- src/core/ext/upb-generated/gogoproto/gogo.upb.c
- src/core/ext/upb-generated/google/api/annotations.upb.c
- src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c
@@ -1810,17 +1682,8 @@ libs:
- src/core/ext/upb-generated/google/rpc/status.upb.c
- src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c
- src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c
- - src/core/ext/upb-generated/udpa/annotations/migrate.upb.c
- - src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c
- - src/core/ext/upb-generated/udpa/annotations/status.upb.c
- - src/core/ext/upb-generated/udpa/annotations/versioning.upb.c
- src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c
- src/core/ext/upb-generated/validate/validate.upb.c
- - src/core/ext/xds/xds_api.cc
- - src/core/ext/xds/xds_bootstrap.cc
- - src/core/ext/xds/xds_channel.cc
- - src/core/ext/xds/xds_client.cc
- - src/core/ext/xds/xds_client_stats.cc
- src/core/lib/avl/avl.cc
- src/core/lib/backoff/backoff.cc
- src/core/lib/channel/channel_args.cc
diff --git a/config.m4 b/config.m4
index 3e74b3090af..9f64293beb7 100644
--- a/config.m4
+++ b/config.m4
@@ -225,7 +225,6 @@ if test "$PHP_GRPC" != "no"; then
src/core/ext/upb-generated/validate/validate.upb.c \
src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_bootstrap.cc \
- src/core/ext/xds/xds_channel_secure.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client_stats.cc \
src/core/lib/avl/avl.cc \
diff --git a/config.w32 b/config.w32
index 98ab01a799c..1500b446c31 100644
--- a/config.w32
+++ b/config.w32
@@ -192,7 +192,6 @@ if (PHP_GRPC != "no") {
"src\\core\\ext\\upb-generated\\validate\\validate.upb.c " +
"src\\core\\ext\\xds\\xds_api.cc " +
"src\\core\\ext\\xds\\xds_bootstrap.cc " +
- "src\\core\\ext\\xds\\xds_channel_secure.cc " +
"src\\core\\ext\\xds\\xds_client.cc " +
"src\\core\\ext\\xds\\xds_client_stats.cc " +
"src\\core\\lib\\avl\\avl.cc " +
diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
index fbfaeed8f6d..82f46c429d4 100644
--- a/gRPC-C++.podspec
+++ b/gRPC-C++.podspec
@@ -370,7 +370,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_channel.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
@@ -870,7 +869,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_channel.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
index efa2d132f29..f33344d2e94 100644
--- a/gRPC-Core.podspec
+++ b/gRPC-Core.podspec
@@ -532,9 +532,7 @@ Pod::Spec.new do |s|
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_bootstrap.cc',
'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_channel.h',
'src/core/ext/xds/xds_channel_args.h',
- 'src/core/ext/xds/xds_channel_secure.cc',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.cc',
@@ -1282,7 +1280,6 @@ Pod::Spec.new do |s|
'src/core/ext/upb-generated/validate/validate.upb.h',
'src/core/ext/xds/xds_api.h',
'src/core/ext/xds/xds_bootstrap.h',
- 'src/core/ext/xds/xds_channel.h',
'src/core/ext/xds/xds_channel_args.h',
'src/core/ext/xds/xds_client.h',
'src/core/ext/xds/xds_client_stats.h',
diff --git a/grpc.gemspec b/grpc.gemspec
index 116cfc602b4..59c1a8a1aff 100644
--- a/grpc.gemspec
+++ b/grpc.gemspec
@@ -450,9 +450,7 @@ Gem::Specification.new do |s|
s.files += %w( src/core/ext/xds/xds_api.h )
s.files += %w( src/core/ext/xds/xds_bootstrap.cc )
s.files += %w( src/core/ext/xds/xds_bootstrap.h )
- s.files += %w( src/core/ext/xds/xds_channel.h )
s.files += %w( src/core/ext/xds/xds_channel_args.h )
- s.files += %w( src/core/ext/xds/xds_channel_secure.cc )
s.files += %w( src/core/ext/xds/xds_client.cc )
s.files += %w( src/core/ext/xds/xds_client.h )
s.files += %w( src/core/ext/xds/xds_client_stats.cc )
diff --git a/grpc.gyp b/grpc.gyp
index 56e41d761f1..c26f71bc46b 100644
--- a/grpc.gyp
+++ b/grpc.gyp
@@ -630,7 +630,6 @@
'src/core/ext/upb-generated/validate/validate.upb.c',
'src/core/ext/xds/xds_api.cc',
'src/core/ext/xds/xds_bootstrap.cc',
- 'src/core/ext/xds/xds_channel_secure.cc',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client_stats.cc',
'src/core/lib/avl/avl.cc',
@@ -989,10 +988,6 @@
'src/core/ext/filters/client_channel/lb_policy/priority/priority.cc',
'src/core/ext/filters/client_channel/lb_policy/round_robin/round_robin.cc',
'src/core/ext/filters/client_channel/lb_policy/weighted_target/weighted_target.cc',
- 'src/core/ext/filters/client_channel/lb_policy/xds/cds.cc',
- 'src/core/ext/filters/client_channel/lb_policy/xds/eds.cc',
- 'src/core/ext/filters/client_channel/lb_policy/xds/lrs.cc',
- 'src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc',
'src/core/ext/filters/client_channel/lb_policy_registry.cc',
'src/core/ext/filters/client_channel/local_subchannel_pool.cc',
'src/core/ext/filters/client_channel/proxy_mapper_registry.cc',
@@ -1011,7 +1006,6 @@
'src/core/ext/filters/client_channel/resolver/dns/native/dns_resolver.cc',
'src/core/ext/filters/client_channel/resolver/fake/fake_resolver.cc',
'src/core/ext/filters/client_channel/resolver/sockaddr/sockaddr_resolver.cc',
- 'src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc',
'src/core/ext/filters/client_channel/resolver_registry.cc',
'src/core/ext/filters/client_channel/resolver_result_parsing.cc',
'src/core/ext/filters/client_channel/resolving_lb_policy.cc',
@@ -1067,61 +1061,6 @@
'src/core/ext/transport/chttp2/transport/writing.cc',
'src/core/ext/transport/inproc/inproc_plugin.cc',
'src/core/ext/transport/inproc/inproc_transport.cc',
- 'src/core/ext/upb-generated/envoy/annotations/deprecation.upb.c',
- 'src/core/ext/upb-generated/envoy/annotations/resource.upb.c',
- 'src/core/ext/upb-generated/envoy/config/accesslog/v3/accesslog.upb.c',
- 'src/core/ext/upb-generated/envoy/config/cluster/v3/circuit_breaker.upb.c',
- 'src/core/ext/upb-generated/envoy/config/cluster/v3/cluster.upb.c',
- 'src/core/ext/upb-generated/envoy/config/cluster/v3/filter.upb.c',
- 'src/core/ext/upb-generated/envoy/config/cluster/v3/outlier_detection.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/address.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/backoff.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/base.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/config_source.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/event_service_config.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/grpc_service.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/health_check.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/http_uri.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/protocol.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/proxy_protocol.upb.c',
- 'src/core/ext/upb-generated/envoy/config/core/v3/socket_option.upb.c',
- 'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint.upb.c',
- 'src/core/ext/upb-generated/envoy/config/endpoint/v3/endpoint_components.upb.c',
- 'src/core/ext/upb-generated/envoy/config/endpoint/v3/load_report.upb.c',
- 'src/core/ext/upb-generated/envoy/config/listener/v3/api_listener.upb.c',
- 'src/core/ext/upb-generated/envoy/config/listener/v3/listener.upb.c',
- 'src/core/ext/upb-generated/envoy/config/listener/v3/listener_components.upb.c',
- 'src/core/ext/upb-generated/envoy/config/listener/v3/udp_listener_config.upb.c',
- 'src/core/ext/upb-generated/envoy/config/rbac/v3/rbac.upb.c',
- 'src/core/ext/upb-generated/envoy/config/route/v3/route.upb.c',
- 'src/core/ext/upb-generated/envoy/config/route/v3/route_components.upb.c',
- 'src/core/ext/upb-generated/envoy/config/route/v3/scoped_route.upb.c',
- 'src/core/ext/upb-generated/envoy/config/trace/v3/http_tracer.upb.c',
- 'src/core/ext/upb-generated/envoy/extensions/filters/network/http_connection_manager/v3/http_connection_manager.upb.c',
- 'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/cert.upb.c',
- 'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/common.upb.c',
- 'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/secret.upb.c',
- 'src/core/ext/upb-generated/envoy/extensions/transport_sockets/tls/v3/tls.upb.c',
- 'src/core/ext/upb-generated/envoy/service/cluster/v3/cds.upb.c',
- 'src/core/ext/upb-generated/envoy/service/discovery/v3/ads.upb.c',
- 'src/core/ext/upb-generated/envoy/service/discovery/v3/discovery.upb.c',
- 'src/core/ext/upb-generated/envoy/service/endpoint/v3/eds.upb.c',
- 'src/core/ext/upb-generated/envoy/service/listener/v3/lds.upb.c',
- 'src/core/ext/upb-generated/envoy/service/load_stats/v3/lrs.upb.c',
- 'src/core/ext/upb-generated/envoy/service/route/v3/rds.upb.c',
- 'src/core/ext/upb-generated/envoy/service/route/v3/srds.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/metadata.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/number.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/path.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/regex.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/string.upb.c',
- 'src/core/ext/upb-generated/envoy/type/matcher/v3/value.upb.c',
- 'src/core/ext/upb-generated/envoy/type/metadata/v3/metadata.upb.c',
- 'src/core/ext/upb-generated/envoy/type/tracing/v3/custom_tag.upb.c',
- 'src/core/ext/upb-generated/envoy/type/v3/http.upb.c',
- 'src/core/ext/upb-generated/envoy/type/v3/percent.upb.c',
- 'src/core/ext/upb-generated/envoy/type/v3/range.upb.c',
- 'src/core/ext/upb-generated/envoy/type/v3/semantic_version.upb.c',
'src/core/ext/upb-generated/gogoproto/gogo.upb.c',
'src/core/ext/upb-generated/google/api/annotations.upb.c',
'src/core/ext/upb-generated/google/api/expr/v1alpha1/syntax.upb.c',
@@ -1136,17 +1075,8 @@
'src/core/ext/upb-generated/google/rpc/status.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/health/v1/health.upb.c',
'src/core/ext/upb-generated/src/proto/grpc/lb/v1/load_balancer.upb.c',
- 'src/core/ext/upb-generated/udpa/annotations/migrate.upb.c',
- 'src/core/ext/upb-generated/udpa/annotations/sensitive.upb.c',
- 'src/core/ext/upb-generated/udpa/annotations/status.upb.c',
- 'src/core/ext/upb-generated/udpa/annotations/versioning.upb.c',
'src/core/ext/upb-generated/udpa/data/orca/v1/orca_load_report.upb.c',
'src/core/ext/upb-generated/validate/validate.upb.c',
- 'src/core/ext/xds/xds_api.cc',
- 'src/core/ext/xds/xds_bootstrap.cc',
- 'src/core/ext/xds/xds_channel.cc',
- 'src/core/ext/xds/xds_client.cc',
- 'src/core/ext/xds/xds_client_stats.cc',
'src/core/lib/avl/avl.cc',
'src/core/lib/backoff/backoff.cc',
'src/core/lib/channel/channel_args.cc',
diff --git a/package.xml b/package.xml
index 66bcccb9f69..60f4e6d9dc7 100644
--- a/package.xml
+++ b/package.xml
@@ -430,9 +430,7 @@
-
-
diff --git a/src/core/ext/xds/xds_channel.cc b/src/core/ext/xds/xds_channel.cc
deleted file mode 100644
index b8e34a3b6d1..00000000000
--- a/src/core/ext/xds/xds_channel.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include
-
-#include
-
-#include "src/core/ext/xds/xds_channel.h"
-
-namespace grpc_core {
-
-grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args) {
- return args;
-}
-
-grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
- const grpc_channel_args& args,
- grpc_error** error) {
- if (!bootstrap.server().channel_creds.empty()) {
- *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
- "credential specified but gRPC not built with security");
- return nullptr;
- }
- return grpc_insecure_channel_create(bootstrap.server().server_uri.c_str(),
- &args, nullptr);
-}
-
-} // namespace grpc_core
diff --git a/src/core/ext/xds/xds_channel.h b/src/core/ext/xds/xds_channel.h
deleted file mode 100644
index c172809f81a..00000000000
--- a/src/core/ext/xds/xds_channel.h
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#ifndef GRPC_CORE_EXT_XDS_XDS_CHANNEL_H
-#define GRPC_CORE_EXT_XDS_XDS_CHANNEL_H
-
-#include
-
-#include
-
-#include "src/core/ext/xds/xds_bootstrap.h"
-#include "src/core/lib/iomgr/error.h"
-
-namespace grpc_core {
-
-/// Makes any necessary modifications to \a args for use in the xds
-/// balancer channel.
-///
-/// Takes ownership of \a args.
-///
-/// Caller takes ownership of the returned args.
-grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args);
-
-grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
- const grpc_channel_args& args,
- grpc_error** error);
-
-} // namespace grpc_core
-
-#endif /* GRPC_CORE_EXT_XDS_XDS_CHANNEL_H \
- */
diff --git a/src/core/ext/xds/xds_channel_secure.cc b/src/core/ext/xds/xds_channel_secure.cc
deleted file mode 100644
index 468e34bf726..00000000000
--- a/src/core/ext/xds/xds_channel_secure.cc
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- *
- * Copyright 2018 gRPC authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-#include
-
-#include "src/core/ext/xds/xds_channel.h"
-
-#include
-
-#include "absl/container/inlined_vector.h"
-
-#include
-#include
-#include
-
-#include "src/core/lib/channel/channel_args.h"
-#include "src/core/lib/gpr/string.h"
-#include "src/core/lib/iomgr/sockaddr_utils.h"
-#include "src/core/lib/security/credentials/credentials.h"
-#include "src/core/lib/security/credentials/fake/fake_credentials.h"
-#include "src/core/lib/slice/slice_internal.h"
-
-namespace grpc_core {
-
-grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args) {
- absl::InlinedVector args_to_remove;
- absl::InlinedVector args_to_add;
- // Substitute the channel credentials with a version without call
- // credentials: the load balancer is not necessarily trusted to handle
- // bearer token credentials.
- grpc_channel_credentials* channel_credentials =
- grpc_channel_credentials_find_in_args(args);
- RefCountedPtr creds_sans_call_creds;
- if (channel_credentials != nullptr) {
- creds_sans_call_creds =
- channel_credentials->duplicate_without_call_credentials();
- GPR_ASSERT(creds_sans_call_creds != nullptr);
- args_to_remove.emplace_back(GRPC_ARG_CHANNEL_CREDENTIALS);
- args_to_add.emplace_back(
- grpc_channel_credentials_to_arg(creds_sans_call_creds.get()));
- }
- grpc_channel_args* result = grpc_channel_args_copy_and_add_and_remove(
- args, args_to_remove.data(), args_to_remove.size(), args_to_add.data(),
- args_to_add.size());
- // Clean up.
- grpc_channel_args_destroy(args);
- return result;
-}
-
-grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
- const grpc_channel_args& args,
- grpc_error** error) {
- grpc_channel_credentials* creds = nullptr;
- RefCountedPtr creds_to_unref;
- if (!bootstrap.server().channel_creds.empty()) {
- for (size_t i = 0; i < bootstrap.server().channel_creds.size(); ++i) {
- if (bootstrap.server().channel_creds[i].type == "google_default") {
- creds = grpc_google_default_credentials_create(nullptr);
- break;
- } else if (bootstrap.server().channel_creds[i].type == "fake") {
- creds = grpc_fake_transport_security_credentials_create();
- break;
- }
- }
- if (creds == nullptr) {
- *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
- "no supported credential types found");
- return nullptr;
- }
- creds_to_unref.reset(creds);
- } else {
- creds = grpc_channel_credentials_find_in_args(&args);
- if (creds == nullptr) {
- // Built with security but parent channel is insecure.
- return grpc_insecure_channel_create(bootstrap.server().server_uri.c_str(),
- &args, nullptr);
- }
- }
- const char* arg_to_remove = GRPC_ARG_CHANNEL_CREDENTIALS;
- grpc_channel_args* new_args =
- grpc_channel_args_copy_and_remove(&args, &arg_to_remove, 1);
- grpc_channel* channel = grpc_secure_channel_create(
- creds, bootstrap.server().server_uri.c_str(), new_args, nullptr);
- grpc_channel_args_destroy(new_args);
- return channel;
-}
-
-} // namespace grpc_core
diff --git a/src/core/ext/xds/xds_client.cc b/src/core/ext/xds/xds_client.cc
index 976b1cbe252..a844a04d46a 100644
--- a/src/core/ext/xds/xds_client.cc
+++ b/src/core/ext/xds/xds_client.cc
@@ -35,7 +35,6 @@
#include "src/core/ext/filters/client_channel/client_channel.h"
#include "src/core/ext/filters/client_channel/service_config.h"
#include "src/core/ext/xds/xds_api.h"
-#include "src/core/ext/xds/xds_channel.h"
#include "src/core/ext/xds/xds_channel_args.h"
#include "src/core/ext/xds/xds_client.h"
#include "src/core/ext/xds/xds_client_stats.h"
@@ -52,6 +51,8 @@
#include "src/core/lib/iomgr/sockaddr_utils.h"
#include "src/core/lib/iomgr/timer.h"
#include "src/core/lib/iomgr/work_serializer.h"
+#include "src/core/lib/security/credentials/credentials.h"
+#include "src/core/lib/security/credentials/fake/fake_credentials.h"
#include "src/core/lib/slice/slice_internal.h"
#include "src/core/lib/slice/slice_string_helpers.h"
#include "src/core/lib/surface/call.h"
@@ -417,6 +418,31 @@ class XdsClient::ChannelState::StateWatcher
namespace {
+grpc_channel_args* ModifyXdsChannelArgs(grpc_channel_args* args) {
+ absl::InlinedVector args_to_remove;
+ absl::InlinedVector args_to_add;
+ // Substitute the channel credentials with a version without call
+ // credentials: the load balancer is not necessarily trusted to handle
+ // bearer token credentials.
+ grpc_channel_credentials* channel_credentials =
+ grpc_channel_credentials_find_in_args(args);
+ RefCountedPtr creds_sans_call_creds;
+ if (channel_credentials != nullptr) {
+ creds_sans_call_creds =
+ channel_credentials->duplicate_without_call_credentials();
+ GPR_ASSERT(creds_sans_call_creds != nullptr);
+ args_to_remove.emplace_back(GRPC_ARG_CHANNEL_CREDENTIALS);
+ args_to_add.emplace_back(
+ grpc_channel_credentials_to_arg(creds_sans_call_creds.get()));
+ }
+ grpc_channel_args* result = grpc_channel_args_copy_and_add_and_remove(
+ args, args_to_remove.data(), args_to_remove.size(), args_to_add.data(),
+ args_to_add.size());
+ // Clean up.
+ grpc_channel_args_destroy(args);
+ return result;
+}
+
// Returns the channel args for the xds channel.
grpc_channel_args* BuildXdsChannelArgs(const grpc_channel_args& args) {
static const char* args_to_remove[] = {
@@ -1751,6 +1777,44 @@ grpc_millis GetRequestTimeout(const grpc_channel_args& args) {
{15000, 0, INT_MAX});
}
+grpc_channel* CreateXdsChannel(const XdsBootstrap& bootstrap,
+ const grpc_channel_args& args,
+ grpc_error** error) {
+ grpc_channel_credentials* creds = nullptr;
+ RefCountedPtr creds_to_unref;
+ if (!bootstrap.server().channel_creds.empty()) {
+ for (size_t i = 0; i < bootstrap.server().channel_creds.size(); ++i) {
+ if (bootstrap.server().channel_creds[i].type == "google_default") {
+ creds = grpc_google_default_credentials_create(nullptr);
+ break;
+ } else if (bootstrap.server().channel_creds[i].type == "fake") {
+ creds = grpc_fake_transport_security_credentials_create();
+ break;
+ }
+ }
+ if (creds == nullptr) {
+ *error = GRPC_ERROR_CREATE_FROM_STATIC_STRING(
+ "no supported credential types found");
+ return nullptr;
+ }
+ creds_to_unref.reset(creds);
+ } else {
+ creds = grpc_channel_credentials_find_in_args(&args);
+ if (creds == nullptr) {
+ // Built with security but parent channel is insecure.
+ return grpc_insecure_channel_create(bootstrap.server().server_uri.c_str(),
+ &args, nullptr);
+ }
+ }
+ const char* arg_to_remove = GRPC_ARG_CHANNEL_CREDENTIALS;
+ grpc_channel_args* new_args =
+ grpc_channel_args_copy_and_remove(&args, &arg_to_remove, 1);
+ grpc_channel* channel = grpc_secure_channel_create(
+ creds, bootstrap.server().server_uri.c_str(), new_args, nullptr);
+ grpc_channel_args_destroy(new_args);
+ return channel;
+}
+
} // namespace
XdsClient::XdsClient(std::shared_ptr work_serializer,
diff --git a/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc b/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
index 525fa108d81..fd9bf9c14d5 100644
--- a/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
+++ b/src/core/plugin_registry/grpc_unsecure_plugin_registry.cc
@@ -38,22 +38,12 @@ void grpc_resolver_sockaddr_init(void);
void grpc_resolver_sockaddr_shutdown(void);
void grpc_resolver_fake_init(void);
void grpc_resolver_fake_shutdown(void);
-void grpc_resolver_xds_init(void);
-void grpc_resolver_xds_shutdown(void);
void grpc_lb_policy_grpclb_init(void);
void grpc_lb_policy_grpclb_shutdown(void);
-void grpc_lb_policy_cds_init(void);
-void grpc_lb_policy_cds_shutdown(void);
-void grpc_lb_policy_eds_init(void);
-void grpc_lb_policy_eds_shutdown(void);
-void grpc_lb_policy_lrs_init(void);
-void grpc_lb_policy_lrs_shutdown(void);
void grpc_lb_policy_priority_init(void);
void grpc_lb_policy_priority_shutdown(void);
void grpc_lb_policy_weighted_target_init(void);
void grpc_lb_policy_weighted_target_shutdown(void);
-void grpc_lb_policy_xds_routing_init(void);
-void grpc_lb_policy_xds_routing_shutdown(void);
void grpc_lb_policy_pick_first_init(void);
void grpc_lb_policy_pick_first_shutdown(void);
void grpc_lb_policy_round_robin_init(void);
@@ -90,22 +80,12 @@ void grpc_register_built_in_plugins(void) {
grpc_resolver_sockaddr_shutdown);
grpc_register_plugin(grpc_resolver_fake_init,
grpc_resolver_fake_shutdown);
- grpc_register_plugin(grpc_resolver_xds_init,
- grpc_resolver_xds_shutdown);
grpc_register_plugin(grpc_lb_policy_grpclb_init,
grpc_lb_policy_grpclb_shutdown);
- grpc_register_plugin(grpc_lb_policy_cds_init,
- grpc_lb_policy_cds_shutdown);
- grpc_register_plugin(grpc_lb_policy_eds_init,
- grpc_lb_policy_eds_shutdown);
- grpc_register_plugin(grpc_lb_policy_lrs_init,
- grpc_lb_policy_lrs_shutdown);
grpc_register_plugin(grpc_lb_policy_priority_init,
grpc_lb_policy_priority_shutdown);
grpc_register_plugin(grpc_lb_policy_weighted_target_init,
grpc_lb_policy_weighted_target_shutdown);
- grpc_register_plugin(grpc_lb_policy_xds_routing_init,
- grpc_lb_policy_xds_routing_shutdown);
grpc_register_plugin(grpc_lb_policy_pick_first_init,
grpc_lb_policy_pick_first_shutdown);
grpc_register_plugin(grpc_lb_policy_round_robin_init,
diff --git a/src/python/grpcio/grpc_core_dependencies.py b/src/python/grpcio/grpc_core_dependencies.py
index 5b2b78dcfb5..6c63a7fdc82 100644
--- a/src/python/grpcio/grpc_core_dependencies.py
+++ b/src/python/grpcio/grpc_core_dependencies.py
@@ -201,7 +201,6 @@ CORE_SOURCE_FILES = [
'src/core/ext/upb-generated/validate/validate.upb.c',
'src/core/ext/xds/xds_api.cc',
'src/core/ext/xds/xds_bootstrap.cc',
- 'src/core/ext/xds/xds_channel_secure.cc',
'src/core/ext/xds/xds_client.cc',
'src/core/ext/xds/xds_client_stats.cc',
'src/core/lib/avl/avl.cc',
diff --git a/tools/doxygen/Doxyfile.c++.internal b/tools/doxygen/Doxyfile.c++.internal
index 38c9aad2d71..28d27cacdbe 100644
--- a/tools/doxygen/Doxyfile.c++.internal
+++ b/tools/doxygen/Doxyfile.c++.internal
@@ -1398,9 +1398,7 @@ src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_api.h \
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap.h \
-src/core/ext/xds/xds_channel.h \
src/core/ext/xds/xds_channel_args.h \
-src/core/ext/xds/xds_channel_secure.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client.h \
src/core/ext/xds/xds_client_stats.cc \
diff --git a/tools/doxygen/Doxyfile.core.internal b/tools/doxygen/Doxyfile.core.internal
index c30a42258e0..b0a92e95da3 100644
--- a/tools/doxygen/Doxyfile.core.internal
+++ b/tools/doxygen/Doxyfile.core.internal
@@ -1221,9 +1221,7 @@ src/core/ext/xds/xds_api.cc \
src/core/ext/xds/xds_api.h \
src/core/ext/xds/xds_bootstrap.cc \
src/core/ext/xds/xds_bootstrap.h \
-src/core/ext/xds/xds_channel.h \
src/core/ext/xds/xds_channel_args.h \
-src/core/ext/xds/xds_channel_secure.cc \
src/core/ext/xds/xds_client.cc \
src/core/ext/xds/xds_client.h \
src/core/ext/xds/xds_client_stats.cc \