Skip to content

xds: Merge ClusterResolverLB into CdsLB2 #12591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ejona86 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

xds: Merge ClusterResolverLB into CdsLB2 #12591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
417 changes: 381 additions & 36 deletions xds/src/main/java/io/grpc/xds/CdsLoadBalancer2.java
View file
Open in desktop

Large diffs are not rendered by default.

455 changes: 0 additions & 455 deletions xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancer.java
View file
Open in desktop

This file was deleted.

245 changes: 0 additions & 245 deletions xds/src/main/java/io/grpc/xds/ClusterResolverLoadBalancerProvider.java
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion xds/src/main/java/io/grpc/xds/XdsLbPolicies.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
final class XdsLbPolicies {
static final String CLUSTER_MANAGER_POLICY_NAME = "cluster_manager_experimental";
static final String CDS_POLICY_NAME = "cds_experimental";
static final String CLUSTER_RESOLVER_POLICY_NAME = "cluster_resolver_experimental";
static final String PRIORITY_POLICY_NAME = "priority_experimental";
static final String CLUSTER_IMPL_POLICY_NAME = "cluster_impl_experimental";
static final String WEIGHTED_TARGET_POLICY_NAME = "weighted_target_experimental";
Expand Down
1 change: 0 additions & 1 deletion xds/src/main/resources/META-INF/services/io.grpc.LoadBalancerProvider
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ io.grpc.xds.CdsLoadBalancerProvider
io.grpc.xds.PriorityLoadBalancerProvider
io.grpc.xds.WeightedTargetLoadBalancerProvider
io.grpc.xds.ClusterManagerLoadBalancerProvider
io.grpc.xds.ClusterResolverLoadBalancerProvider
io.grpc.xds.ClusterImplLoadBalancerProvider
io.grpc.xds.LeastRequestLoadBalancerProvider
io.grpc.xds.RingHashLoadBalancerProvider
Expand Down
Loading