xds: delete deprecated xds-experimental scheme

grpc · Jul 14, 2020 · bacd12e · bacd12e
1 parent 631e07f
commit bacd12e
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 198 deletions.
diff --git a/examples/example-xds/README.md b/examples/example-xds/README.md
@@ -42,10 +42,10 @@ However, that didn't use XDS! To use XDS we assume you have deployed the server
 in your deployment environment and know its name. You need to set the
 `GRPC_XDS_BOOTSTRAP` environment variable to point to a gRPC XDS bootstrap
 file (see [gRFC A27](https://github.com/grpc/proposal/pull/170) for the
-bootstrap format). Then use the `xds-experimental:` target scheme during
+bootstrap format). Then use the `xds:` target scheme during
 channel creation.
 
 ```
 $ export GRPC_XDS_BOOTSTRAP=/path/to/bootstrap.json
-$ ./build/install/example-xds/bin/xds-hello-world-client "XDS world" xds-experimental:///yourServersName
+$ ./build/install/example-xds/bin/xds-hello-world-client "XDS world" xds:///yourServersName
 ```
diff --git a/xds/src/main/java/io/grpc/xds/XdsExperimentalNameResolverProvider.java b/xds/src/main/java/io/grpc/xds/XdsExperimentalNameResolverProvider.java
diff --git a/xds/src/main/java/io/grpc/xds/XdsNameResolver.java b/xds/src/main/java/io/grpc/xds/XdsNameResolver.java
@@ -60,7 +60,7 @@
 import javax.annotation.Nullable;
 
 /**
- * A {@link NameResolver} for resolving gRPC target names with "xds-experimental" scheme.
+ * A {@link NameResolver} for resolving gRPC target names with "xds:" scheme.
  *
  * <p>Resolving a gRPC target involves contacting the control plane management server via xDS
  * protocol to retrieve service information and produce a service config to the caller.

diff --git a/xds/src/main/java/io/grpc/xds/package-info.java b/xds/src/main/java/io/grpc/xds/package-info.java
@@ -18,7 +18,7 @@
  * Library for gPRC proxyless service mesh using Envoy xDS protocol.
  *
  * <p>The package currently includes a name resolver plugin and a family of load balancer plugins.
- * A gRPC channel for a target with {@code "xds-experimental"} scheme will load the plugins and a
+ * A gRPC channel for a target with {@code "xds:"} scheme will load the plugins and a
  * bootstrap file, and will communicate with an external control plane management server (e.g.
  * Traffic Director) that speaks Envoy xDS protocol to retrieve routing, load balancing, load
  * reporting configurations etc. for the channel. More features will be added.

diff --git a/xds/src/main/resources/META-INF/services/io.grpc.NameResolverProvider b/xds/src/main/resources/META-INF/services/io.grpc.NameResolverProvider
@@ -1,2 +1 @@
 io.grpc.xds.XdsNameResolverProvider
-io.grpc.xds.XdsExperimentalNameResolverProvider
diff --git a/xds/src/test/java/io/grpc/xds/XdsExperimentalNameResolverProviderTest.java b/xds/src/test/java/io/grpc/xds/XdsExperimentalNameResolverProviderTest.java
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1 @@
		io.grpc.xds.XdsNameResolverProvider
		io.grpc.xds.XdsExperimentalNameResolverProvider