[xDS] move CDS and EDS watchers into xds resolver (#35011)

Implements gRFC A74 (grpc/proposal#404). Closes #35011 COPYBARA_INTEGRATE_REVIEW=#35011 from markdroth:xds_watchers_in_xds_resolver a39f71f PiperOrigin-RevId: 595134549
grpc · Jan 2, 2024 · c7101d0 · c7101d0
1 parent 2c18d16
commit c7101d0
Show file tree

Hide file tree

Showing 60 changed files with 2,945 additions and 3,125 deletions.
diff --git a/BUILD b/BUILD
@@ -584,7 +584,6 @@ GRPC_XDS_TARGETS = [
     "//src/core:grpc_lb_policy_cds",
     "//src/core:grpc_lb_policy_xds_cluster_impl",
     "//src/core:grpc_lb_policy_xds_cluster_manager",
-    "//src/core:grpc_lb_policy_xds_cluster_resolver",
     "//src/core:grpc_lb_policy_xds_override_host",
     "//src/core:grpc_lb_policy_xds_wrr_locality",
     "//src/core:grpc_lb_policy_ring_hash",

diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/Makefile b/Makefile
diff --git a/Package.swift b/Package.swift
diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml
diff --git a/config.m4 b/config.m4
diff --git a/config.w32 b/config.w32
diff --git a/doc/environment_variables.md b/doc/environment_variables.md
@@ -102,7 +102,6 @@ some configuration as environment variables that can be set.
   - xds_client - traces xds client
   - xds_cluster_manager_lb - traces cluster manager LB policy
   - xds_cluster_impl_lb - traces cluster impl LB policy
-  - xds_cluster_resolver_lb - traces xds cluster resolver LB policy
   - xds_resolver - traces xds resolver
 
   The following tracers will only run in binaries built in DEBUG mode. This is

diff --git a/gRPC-C++.podspec b/gRPC-C++.podspec
diff --git a/gRPC-Core.podspec b/gRPC-Core.podspec
diff --git a/grpc.gemspec b/grpc.gemspec
diff --git a/grpc.gyp b/grpc.gyp