Commit feab4e5
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- xds
- src
- generated/thirdparty/grpc/io/envoyproxy/envoy
- api/v2
- service
- discovery/v2
- load_stats/v2
- main/java/io/grpc/xds
- client
- test/java/io/grpc/xds
- third_party/envoy
- src/main/proto/envoy
- annotations
- api/v2
- auth
- cluster
- core
- endpoint
- listener
- route
- config
- cluster/aggregate/v2alpha
- filter
- accesslog/v2
- fault/v2
- http
- fault/v2
- router/v2
- network/http_connection_manager/v2
- listener/v2
- rbac/v2
- trace/v2
- service
- discovery/v2
- load_stats/v2
- type
- matcher
- metadata/v2
- tracing/v2
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 changedLines changed: 0 additions & 427 deletions
This file was deleted.
Lines changed: 0 additions & 417 deletions
This file was deleted.
Lines changed: 0 additions & 445 deletions
This file was deleted.
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.
Lines changed: 0 additions & 349 deletions
This file was deleted.
Lines changed: 0 additions & 389 deletions
This file was deleted.
Lines changed: 0 additions & 409 deletions
This file was deleted.
Lines changed: 0 additions & 335 deletions
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
53 | 53 | | |
54 | 54 | | |
55 | 55 | | |
56 | | - | |
57 | 56 | | |
58 | | - | |
59 | | - | |
60 | 57 | | |
61 | | - | |
62 | 58 | | |
63 | 59 | | |
64 | 60 | | |
65 | | - | |
66 | 61 | | |
67 | 62 | | |
68 | 63 | | |
69 | 64 | | |
70 | 65 | | |
71 | | - | |
72 | 66 | | |
73 | | - | |
74 | 67 | | |
75 | | - | |
76 | | - | |
77 | | - | |
78 | | - | |
| 68 | + | |
79 | 69 | | |
80 | 70 | | |
81 | 71 | | |
| |||
0 commit comments