From bb3aa10d40e4e975117f7e4bf64268958528698c Mon Sep 17 00:00:00 2001 From: Alexander Polcyn Date: Mon, 6 Dec 2021 16:58:25 -0800 Subject: [PATCH] Replace C2P resolver env var with experimental scheme suffix --- internal/envconfig/xds.go | 5 ----- xds/googledirectpath/googlec2p.go | 6 ++---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/internal/envconfig/xds.go b/internal/envconfig/xds.go index 13bbeb197229..93522d716d1e 100644 --- a/internal/envconfig/xds.go +++ b/internal/envconfig/xds.go @@ -43,7 +43,6 @@ const ( rbacSupportEnv = "GRPC_XDS_EXPERIMENTAL_RBAC" federationEnv = "GRPC_EXPERIMENTAL_XDS_FEDERATION" - c2pResolverSupportEnv = "GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER" c2pResolverTestOnlyTrafficDirectorURIEnv = "GRPC_TEST_ONLY_GOOGLE_C2P_RESOLVER_TRAFFIC_DIRECTOR_URI" ) @@ -86,10 +85,6 @@ var ( // XDSFederation indicates whether federation support is enabled. XDSFederation = strings.EqualFold(os.Getenv(federationEnv), "true") - // C2PResolver indicates whether support for C2P resolver is enabled. - // This can be enabled by setting the environment variable - // "GRPC_EXPERIMENTAL_GOOGLE_C2P_RESOLVER" to "true". - C2PResolver = strings.EqualFold(os.Getenv(c2pResolverSupportEnv), "true") // C2PResolverTestOnlyTrafficDirectorURI is the TD URI for testing. C2PResolverTestOnlyTrafficDirectorURI = os.Getenv(c2pResolverTestOnlyTrafficDirectorURIEnv) ) diff --git a/xds/googledirectpath/googlec2p.go b/xds/googledirectpath/googlec2p.go index 7f3769df8bb8..d759d25c8519 100644 --- a/xds/googledirectpath/googlec2p.go +++ b/xds/googledirectpath/googlec2p.go @@ -47,7 +47,7 @@ import ( ) const ( - c2pScheme = "google-c2p" + c2pScheme = "google-c2p-experimental" tdURL = "dns:///directpath-pa.googleapis.com" httpReqTimeout = 10 * time.Second @@ -75,9 +75,7 @@ var ( ) func init() { - if envconfig.C2PResolver { - resolver.Register(c2pResolverBuilder{}) - } + resolver.Register(c2pResolverBuilder{}) } type c2pResolverBuilder struct{}