xds: enable RLS in xDS by default (#6343)

dfawley · web-flow · commit 2b1d70be0280 · 2023-06-01T15:31:27.000-07:00
diff --git 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
@@ -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",

Original file line number	Diff line number	Diff line change
`@@ -1299,7 +1299,7 @@ func (s) TestRoutesProtoToSlice(t *testing.T) {`
`1299`	`1299`	`ClusterSpecifier: &v3routepb.RouteAction_ClusterSpecifierPlugin{}}},`
`1300`	`1300`	`},`
`1301`	`1301`	`},`
`1302`		`- wantRoutes: []*Route{},`
	`1302`	`+ wantErr: true,`
`1303`	`1303`	`},`
`1304`	`1304`	`{`
`1305`	`1305`	`name: "default totalWeight is 100 in weighted clusters action",`