Skip to content

Commit feab4e5

Browse files
authored
xds: Get rid of xDS v2 dependencies (#10968)
xDS v2 support was dropped about a year ago, but the xds package still had a few xDS v2 usages. This PR: - Removes all leftover usages of xDS v2 classes in gprc-xds - Removes all imported xDS v2 protos and their leaf dependencies: - Removes xDS v2 generated services - Makes minor improvements to the xds import script output ### Before ```sh # Imported 154 protos. ❯ find . -iname "*xds*.jar" -exec du -h {} \; | col -x 13M ./build/libs/grpc-xds-1.63.0-SNAPSHOT-original.jar 6.1M ./build/libs/grpc-xds-1.63.0-SNAPSHOT-sources.jar 388K ./build/libs/grpc-xds-1.63.0-SNAPSHOT-javadoc.jar 14M ./build/libs/grpc-xds-1.63.0-SNAPSHOT.jar ``` ### After ```sh # Imported 86 protos. ❯ find . -iname "*xds*.jar" -exec du -h {} \; | col -x 9.1M ./build/libs/grpc-xds-1.63.0-SNAPSHOT-original.jar 4.1M ./build/libs/grpc-xds-1.63.0-SNAPSHOT-sources.jar 388K ./build/libs/grpc-xds-1.63.0-SNAPSHOT-javadoc.jar 9.1M ./build/libs/grpc-xds-1.63.0-SNAPSHOT.jar ``` Reduction: - Number of protos: 44% - Jar size: 35%
1 parent e697ecc commit feab4e5

File tree

82 files changed

+47
-13506
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+47
-13506
lines changed

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ClusterDiscoveryServiceGrpc.java

Lines changed: 0 additions & 427 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/EndpointDiscoveryServiceGrpc.java

Lines changed: 0 additions & 417 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ListenerDiscoveryServiceGrpc.java

Lines changed: 0 additions & 445 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/RouteDiscoveryServiceGrpc.java

Lines changed: 0 additions & 451 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/ScopedRoutesDiscoveryServiceGrpc.java

Lines changed: 0 additions & 463 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/api/v2/VirtualHostDiscoveryServiceGrpc.java

Lines changed: 0 additions & 349 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/AggregatedDiscoveryServiceGrpc.java

Lines changed: 0 additions & 389 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/discovery/v2/SecretDiscoveryServiceGrpc.java

Lines changed: 0 additions & 409 deletions
This file was deleted.

xds/src/generated/thirdparty/grpc/io/envoyproxy/envoy/service/load_stats/v2/LoadReportingServiceGrpc.java

Lines changed: 0 additions & 335 deletions
This file was deleted.

xds/src/main/java/io/grpc/xds/MessagePrinter.java

Lines changed: 1 addition & 11 deletions
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 =

0 commit comments

Comments
 (0)