diff --git a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java index f690de5866d..2dd07a17b08 100644 --- a/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java +++ b/googleapis/src/main/java/io/grpc/googleapis/GoogleCloudToProdNameResolver.java @@ -209,7 +209,7 @@ public void run() { serverBuilder.put("server_uri", serverUri); serverBuilder.put("channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default"))); - serverBuilder.put("server_features", ImmutableList.of("xds_v3")); + serverBuilder.put("server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion")); ImmutableMap.Builder authoritiesBuilder = ImmutableMap.builder(); authoritiesBuilder.put( C2P_AUTHORITY, diff --git a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java index ccf0df5386a..f249ddbaf02 100644 --- a/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java +++ b/googleapis/src/test/java/io/grpc/googleapis/GoogleCloudToProdNameResolverTest.java @@ -187,7 +187,7 @@ public void onGcpAndNoProvidedBootstrapDelegateToXds() { assertThat(server).containsExactly( "server_uri", "directpath-pa.googleapis.com", "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), - "server_features", ImmutableList.of("xds_v3")); + "server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion")); Map authorities = (Map) bootstrap.get("authorities"); assertThat(authorities).containsExactly( "traffic-director-c2p.xds.googleapis.com", @@ -217,7 +217,7 @@ public void onGcpAndNoProvidedBootstrapAndFederationEnabledDelegateToXds() { assertThat(server).containsExactly( "server_uri", "directpath-pa.googleapis.com", "channel_creds", ImmutableList.of(ImmutableMap.of("type", "google_default")), - "server_features", ImmutableList.of("xds_v3")); + "server_features", ImmutableList.of("xds_v3", "ignore_resource_deletion")); Map authorities = (Map) bootstrap.get("authorities"); assertThat(authorities).containsExactly( "traffic-director-c2p.xds.googleapis.com",