From 2b1d70be0280e4b4b3f4a57869a2d362f5029fa8 Mon Sep 17 00:00:00 2001 From: Doug Fawley Date: Thu, 1 Jun 2023 15:31:27 -0700 Subject: [PATCH] xds: enable RLS in xDS by default (#6343) --- internal/envconfig/xds.go | 6 +++--- xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/internal/envconfig/xds.go b/internal/envconfig/xds.go index 8b3418785450..02b4b6a1c109 100644 --- a/internal/envconfig/xds.go +++ b/internal/envconfig/xds.go @@ -81,10 +81,10 @@ var ( XDSFederation = boolFromEnv("GRPC_EXPERIMENTAL_XDS_FEDERATION", true) // XDSRLS indicates whether processing of Cluster Specifier plugins and - // support for the RLS CLuster Specifier is enabled, which can be enabled by + // support for the RLS CLuster Specifier is enabled, which can be disabled by // setting the environment variable "GRPC_EXPERIMENTAL_XDS_RLS_LB" to - // "true". - XDSRLS = boolFromEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB", false) + // "false". + XDSRLS = boolFromEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB", true) // C2PResolverTestOnlyTrafficDirectorURI is the TD URI for testing. C2PResolverTestOnlyTrafficDirectorURI = os.Getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI") diff --git a/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go b/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go index 5e0d1e4523b6..fa10d2aa2694 100644 --- a/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go +++ b/xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go @@ -1299,7 +1299,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) { ClusterSpecifier: &v3routepb.RouteAction_ClusterSpecifierPlugin{}}}, }, }, - wantRoutes: []*Route{}, + wantErr: true, }, { name: "default totalWeight is 100 in weighted clusters action",