From 889412c416a48c767392a858d5bfc6d3422a1c79 Mon Sep 17 00:00:00 2001
From: apolcyn <apolcyn@google.com>
Date: Fri, 2 Jun 2023 12:26:45 -0700
Subject: [PATCH] [Rls] de-experimentalize RLS in XDS (#33290)

Integration tests are passing, so we should be ready to
de-experimentalize.

Related: internal bug b/265209578
---
 src/core/ext/xds/xds_route_config.cc                 | 4 ++--
 test/core/xds/xds_route_config_resource_type_test.cc | 1 +
 test/cpp/end2end/xds/xds_rls_end2end_test.cc         | 2 ++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/core/ext/xds/xds_route_config.cc b/src/core/ext/xds/xds_route_config.cc
index 4fafe69646d..f2dc8bad112 100644
--- a/src/core/ext/xds/xds_route_config.cc
+++ b/src/core/ext/xds/xds_route_config.cc
@@ -80,10 +80,10 @@
 
 namespace grpc_core {
 
-// TODO(donnadionne): Remove once RLS is no longer experimental
+// TODO(apolcyn): remove this flag by the 1.58 release
 bool XdsRlsEnabled() {
   auto value = GetEnv("GRPC_EXPERIMENTAL_XDS_RLS_LB");
-  if (!value.has_value()) return false;
+  if (!value.has_value()) return true;
   bool parsed_value;
   bool parse_succeeded = gpr_parse_bool_value(value->c_str(), &parsed_value);
   return parse_succeeded && parsed_value;
diff --git a/test/core/xds/xds_route_config_resource_type_test.cc b/test/core/xds/xds_route_config_resource_type_test.cc
index 4bbc3730ace..e852ac9ff17 100644
--- a/test/core/xds/xds_route_config_resource_type_test.cc
+++ b/test/core/xds/xds_route_config_resource_type_test.cc
@@ -1886,6 +1886,7 @@ TEST_F(RlsTest, NotUsedInAllVirtualHosts) {
 }
 
 TEST_F(RlsTest, ClusterSpecifierPluginsIgnoredWhenNotEnabled) {
+  testing::ScopedEnvVar env_var("GRPC_EXPERIMENTAL_XDS_RLS_LB", "false");
   RouteConfiguration route_config;
   route_config.set_name("foo");
   auto* cluster_specifier_plugin = route_config.add_cluster_specifier_plugins();
diff --git a/test/cpp/end2end/xds/xds_rls_end2end_test.cc b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
index 655cabeacda..3ddcdcf193d 100644
--- a/test/cpp/end2end/xds/xds_rls_end2end_test.cc
+++ b/test/cpp/end2end/xds/xds_rls_end2end_test.cc
@@ -163,6 +163,8 @@ TEST_P(RlsTest, XdsRoutingClusterSpecifierPlugin) {
 }
 
 TEST_P(RlsTest, XdsRoutingClusterSpecifierPluginDisabled) {
+  grpc_core::testing::ScopedEnvVar env_var("GRPC_EXPERIMENTAL_XDS_RLS_LB",
+                                           "false");
   CreateAndStartBackends(1);
   // Populate new EDS resources.
   EdsResourceArgs args({{"locality0", CreateEndpointsForBackends()}});