Replace C2P resolver env var with experimental scheme suffix

grpc · Dec 7, 2021 · 8777085 · 8777085
1 parent 5cc94a5
commit 8777085
Showing 1 changed file with 2 additions and 7 deletions.
diff --git a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolverProvider.java
@@ -29,9 +29,7 @@
 @Internal
 public final class GoogleCloudToProdNameResolverProvider extends NameResolverProvider {
 
-  private static final boolean enableC2PResolver =
-      Boolean.parseBoolean(System.getenv("GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER"));
-  private static final String SCHEME = "google-c2p";
+  private static final String SCHEME = "google-c2p-experimental";
 
   @Override
   public NameResolver newNameResolver(URI targetUri, Args args) {
@@ -50,10 +48,7 @@ public String getDefaultScheme() {
 
   @Override
   protected boolean isAvailable() {
-    if (enableC2PResolver) {
-      return true;
-    }
-    return false;
+    return true;
   }
 
   @Override