Skip to content

Commit 2b1d70b

Browse files
authored
xds: enable RLS in xDS by default (#6343)
1 parent 47f8ed8 commit 2b1d70b

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

internal/envconfig/xds.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,10 @@ var (
8181
XDSFederation = boolFromEnv("GRPC_EXPERIMENTAL_XDS_FEDERATION", true)
8282

8383
// XDSRLS indicates whether processing of Cluster Specifier plugins and
84-
// support for the RLS CLuster Specifier is enabled, which can be enabled by
84+
// support for the RLS CLuster Specifier is enabled, which can be disabled by
8585
// setting the environment variable "GRPC_EXPERIMENTAL_XDS_RLS_LB" to
86-
// "true".
87-
XDSRLS = boolFromEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB", false)
86+
// "false".
87+
XDSRLS = boolFromEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB", true)
8888

8989
// C2PResolverTestOnlyTrafficDirectorURI is the TD URI for testing.
9090
C2PResolverTestOnlyTrafficDirectorURI = os.Getenv("GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI")

xds/internal/xdsclient/xdsresource/unmarshal_rds_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1299,7 +1299,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {
12991299
ClusterSpecifier: &v3routepb.RouteAction_ClusterSpecifierPlugin{}}},
13001300
},
13011301
},
1302-
wantRoutes: []*Route{},
1302+
wantErr: true,
13031303
},
13041304
{
13051305
name: "default totalWeight is 100 in weighted clusters action",

0 commit comments

Comments
 (0)