diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer.go b/xds/internal/balancer/cdsbalancer/cdsbalancer.go index 0d49b3813f61..8d5c3c32b4e4 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer.go +++ b/xds/internal/balancer/cdsbalancer/cdsbalancer.go @@ -37,8 +37,8 @@ import ( ) const ( - cdsName = "experimental_cds" - edsName = "experimental_eds" + cdsName = "cds_experimental" + edsName = "eds_experimental" ) var ( diff --git a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go index 6fc0bcaa2596..b03a067bb6b9 100644 --- a/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go +++ b/xds/internal/balancer/cdsbalancer/cdsbalancer_test.go @@ -175,7 +175,7 @@ func cdsCCS(cluster string, xdsClient interface{}) balancer.ClientConnState { const cdsLBConfig = `{ "loadBalancingConfig":[ { - "experimental_cds":{ + "cds_experimental":{ "Cluster": %s } } diff --git a/xds/internal/balancer/edsbalancer/eds.go b/xds/internal/balancer/edsbalancer/eds.go index 2199e038190b..7c6dda274e9c 100644 --- a/xds/internal/balancer/edsbalancer/eds.go +++ b/xds/internal/balancer/edsbalancer/eds.go @@ -38,7 +38,7 @@ import ( const ( defaultTimeout = 10 * time.Second - edsName = "experimental_eds" + edsName = "eds_experimental" ) var ( diff --git a/xds/internal/balancer/edsbalancer/xds_old.go b/xds/internal/balancer/edsbalancer/xds_old.go index 64bb8b40f34d..6729e6801f15 100644 --- a/xds/internal/balancer/edsbalancer/xds_old.go +++ b/xds/internal/balancer/edsbalancer/xds_old.go @@ -36,7 +36,7 @@ func init() { } // xdsBalancerBuilder register edsBalancerBuilder (now with name -// "experimental_eds") under the old name "xds_experimental". +// "eds_experimental") under the old name "xds_experimental". type xdsBalancerBuilder struct { edsBalancerBuilder } diff --git a/xds/internal/resolver/xds_resolver.go b/xds/internal/resolver/xds_resolver.go index d961918e4c3a..f116eff9bd3b 100644 --- a/xds/internal/resolver/xds_resolver.go +++ b/xds/internal/resolver/xds_resolver.go @@ -155,7 +155,7 @@ type xdsResolver struct { const jsonFormatSC = `{ "loadBalancingConfig":[ { - "experimental_cds":{ + "cds_experimental":{ "Cluster": "%s" } }