xds: Get rid of xDS v2 dependencies (#10968) · grpc/grpc-java@feab4e5

File tree

82 files changed

lines changed

      • generated/thirdparty/grpc/io/envoyproxy/envoy

          • cluster/aggregate/v2alpha

            • network/http_connection_manager/v2

82 files changed

lines changed

Original file line numberDiff line numberDiff line change

@@ -53,29 +53,19 @@ private static JsonFormat.Printer newPrinter() {

5353

TypeRegistry.Builder registry =

5454

TypeRegistry.newBuilder()

5555

.add(Listener.getDescriptor())

56-

.add(io.envoyproxy.envoy.api.v2.Listener.getDescriptor())

5756

.add(HttpConnectionManager.getDescriptor())

58-

.add(io.envoyproxy.envoy.config.filter.network.http_connection_manager.v2

59-

.HttpConnectionManager.getDescriptor())

6057

.add(HTTPFault.getDescriptor())

61-

.add(io.envoyproxy.envoy.config.filter.http.fault.v2.HTTPFault.getDescriptor())

6258

.add(RBAC.getDescriptor())

6359

.add(RBACPerRoute.getDescriptor())

6460

.add(Router.getDescriptor())

65-

.add(io.envoyproxy.envoy.config.filter.http.router.v2.Router.getDescriptor())

6661

// UpstreamTlsContext and DownstreamTlsContext in v3 are not transitively imported

6762

// by top-level resource types.

6863

.add(UpstreamTlsContext.getDescriptor())

6964

.add(DownstreamTlsContext.getDescriptor())

7065

.add(RouteConfiguration.getDescriptor())

71-

.add(io.envoyproxy.envoy.api.v2.RouteConfiguration.getDescriptor())

7266

.add(Cluster.getDescriptor())

73-

.add(io.envoyproxy.envoy.api.v2.Cluster.getDescriptor())

7467

.add(ClusterConfig.getDescriptor())

75-

.add(io.envoyproxy.envoy.config.cluster.aggregate.v2alpha.ClusterConfig

76-

.getDescriptor())

77-

.add(ClusterLoadAssignment.getDescriptor())

78-

.add(io.envoyproxy.envoy.api.v2.ClusterLoadAssignment.getDescriptor());

68+

.add(ClusterLoadAssignment.getDescriptor());

7969

try {

8070

@SuppressWarnings("unchecked")

8171

Class<? extends Message> routeLookupClusterSpecifierClass =