Merge pull request #25338 from markdroth/xds_v3

xds: Remove env-var protection for xDS v3 support.

src/core/ext/xds/xds_bootstrap.cc

@@ -384,15 +384,7 @@ grpc_error* XdsBootstrap::ParseServerFeaturesArray(Json* json,
     Json& child = json->mutable_array()->at(i);
     if (child.type() == Json::Type::STRING &&
         child.string_value() == "xds_v3") {
-      // TODO(roth): Remove env var check once we do interop testing and
+      server->server_features.insert(std::move(*child.mutable_string_value()));
-      // are sure that the v3 code actually works.
-      grpc_core::UniquePtr<char> enable_str(
-          gpr_getenv("GRPC_XDS_EXPERIMENTAL_V3_SUPPORT"));
-      bool enabled = false;
-      if (gpr_parse_bool_value(enable_str.get(), &enabled) && enabled) {
-        server->server_features.insert(
-            std::move(*child.mutable_string_value()));
-      }
     }
   }
   return GRPC_ERROR_CREATE_FROM_VECTOR(

test/cpp/end2end/xds_end2end_test.cc

@@ -1534,7 +1534,6 @@ class XdsEnd2endTest : public ::testing::TestWithParam<TestType> {
         bootstrap_contents_from_env_var_(bootstrap_contents_from_env_var) {}
 
   void SetUp() override {
-    gpr_setenv("GRPC_XDS_EXPERIMENTAL_V3_SUPPORT", "true");
     if (bootstrap_contents_from_env_var_) {
       gpr_setenv("GRPC_XDS_BOOTSTRAP_CONFIG",
                  GetParam().use_v2() ? kBootstrapFileV2 : kBootstrapFileV3);