diff --git a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java index 34680f8cae..45d146e4a8 100644 --- a/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java +++ b/xds/src/main/java/io/grpc/xds/GoogleCloudToProdNameResolver.java @@ -187,6 +187,7 @@ final class GoogleCloudToProdNameResolver extends NameResolver { serverBuilder.put("server_uri", server_uri); serverBuilder.put("channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default"))); + serverBuilder.put("server_features", ImmutableList.of("xds_v3")); return ImmutableMap.of( "node", nodeBuilder.build(), "xds_servers", ImmutableList.of(serverBuilder.build())); diff --git a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java index 7246dea923..6692f43e85 100644 --- a/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java +++ b/xds/src/test/java/io/grpc/xds/GoogleCloudToProdNameResolverTest.java @@ -183,7 +183,8 @@ public class GoogleCloudToProdNameResolverTest { (List>) bootstrap.get("xds_servers")); assertThat(server).containsExactly( "server_uri", "directpath-trafficdirector.googleapis.com", - "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default"))); + "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), + "server_features", ImmutableList.of("xds_v3")); } @Test