From 8c3a23b44a4c3a3d40c7048107fbb825561b28a8 Mon Sep 17 00:00:00 2001 From: "data-plane-api(Azure Pipelines)" Date: Fri, 29 Oct 2021 21:43:03 +0000 Subject: [PATCH] api: remove v2 dependencies from v3 API protos. (#18817) This should reduce the binary size, which is particularly important for Envoy Mobile. Looking at a local opt build with debug symbols, I'm seeing a drop from ~400MB to ~380MB, so maybe 5% saving. @Reflejo indicates that optimized Envoy Mobile without symbols is observing ~20% improvement. Related to #10943 Risk level: Low Testing: bazel query deps to confirm no more v2 API deps. Signed-off-by: Harvey Tuch Mirrored from https://github.com/envoyproxy/envoy @ 53fca618e47702f6c8dbc323db9bd39d15725457 --- BUILD | 15 +++++++++++++++ envoy/admin/v3/BUILD | 1 - envoy/config/accesslog/v3/BUILD | 1 - envoy/config/bootstrap/v3/BUILD | 1 - envoy/config/cluster/v3/BUILD | 2 -- envoy/config/core/v3/BUILD | 1 - envoy/config/endpoint/v3/BUILD | 2 -- envoy/config/listener/v3/BUILD | 3 --- envoy/config/metrics/v3/BUILD | 1 - envoy/config/overload/v3/BUILD | 1 - envoy/config/route/v3/BUILD | 2 -- envoy/config/tap/v3/BUILD | 1 - envoy/config/trace/v3/BUILD | 2 -- envoy/data/accesslog/v3/BUILD | 1 - envoy/data/tap/v3/BUILD | 1 - envoy/extensions/common/ratelimit/v3/BUILD | 1 - envoy/extensions/filters/common/fault/v3/BUILD | 1 - .../network/http_connection_manager/v3/BUILD | 1 - .../filters/network/redis_proxy/v3/BUILD | 1 - .../extensions/filters/network/tcp_proxy/v3/BUILD | 1 - .../filters/network/thrift_proxy/router/v3/BUILD | 5 +---- .../filters/network/thrift_proxy/v3/BUILD | 1 - envoy/extensions/health_checkers/redis/v3/BUILD | 5 +---- .../resource_monitors/fixed_heap/v3/BUILD | 5 +---- .../resource_monitors/injected_resource/v3/BUILD | 5 +---- .../retry/host/omit_canary_hosts/v3/BUILD | 5 +---- .../extensions/retry/host/previous_hosts/v3/BUILD | 5 +---- envoy/extensions/transport_sockets/alts/v3/BUILD | 5 +---- envoy/extensions/transport_sockets/tls/v3/BUILD | 1 - envoy/service/accesslog/v3/BUILD | 1 - envoy/service/auth/v3/BUILD | 1 - envoy/service/cluster/v3/BUILD | 1 - envoy/service/discovery/v3/BUILD | 2 -- envoy/service/endpoint/v3/BUILD | 1 - envoy/service/health/v3/BUILD | 1 - envoy/service/listener/v3/BUILD | 1 - envoy/service/load_stats/v3/BUILD | 1 - envoy/service/metrics/v3/BUILD | 1 - envoy/service/ratelimit/v3/BUILD | 1 - envoy/service/route/v3/BUILD | 1 - envoy/service/runtime/v3/BUILD | 1 - envoy/service/secret/v3/BUILD | 1 - envoy/service/status/v3/BUILD | 1 - envoy/service/tap/v3/BUILD | 1 - envoy/type/matcher/v3/BUILD | 1 - envoy/type/metadata/v3/BUILD | 5 +---- envoy/type/tracing/v3/BUILD | 1 - envoy/type/v3/BUILD | 5 +---- 48 files changed, 24 insertions(+), 81 deletions(-) diff --git a/BUILD b/BUILD index f814a6d0..11eb3d4b 100644 --- a/BUILD +++ b/BUILD @@ -18,17 +18,31 @@ proto_library( "//envoy/api/v2/ratelimit:pkg", "//envoy/api/v2/route:pkg", "//envoy/config/bootstrap/v2:pkg", + "//envoy/config/cluster/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/common/tap/v2alpha:pkg", "//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/filter/fault/v2:pkg", + "//envoy/config/filter/http/compressor/v2:pkg", + "//envoy/config/filter/http/dynamic_forward_proxy/v2alpha:pkg", + "//envoy/config/filter/http/gzip/v2:pkg", + "//envoy/config/filter/http/rate_limit/v2:pkg", + "//envoy/config/filter/http/rbac/v2:pkg", + "//envoy/config/filter/network/dubbo_proxy/v2alpha1:pkg", "//envoy/config/filter/network/http_connection_manager/v2:pkg", + "//envoy/config/filter/network/rate_limit/v2:pkg", + "//envoy/config/filter/network/rbac/v2:pkg", "//envoy/config/filter/network/redis_proxy/v2:pkg", "//envoy/config/filter/network/tcp_proxy/v2:pkg", "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", + "//envoy/config/filter/thrift/rate_limit/v2alpha1:pkg", "//envoy/config/filter/thrift/router/v2alpha1:pkg", "//envoy/config/health_checker/redis/v2:pkg", "//envoy/config/listener/v2:pkg", "//envoy/config/metrics/v2:pkg", "//envoy/config/overload/v2alpha:pkg", + "//envoy/config/ratelimit/v2:pkg", + "//envoy/config/rbac/v2:pkg", "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", "//envoy/config/retry/omit_canary_hosts/v2:pkg", @@ -36,6 +50,7 @@ proto_library( "//envoy/config/trace/v2:pkg", "//envoy/config/trace/v2alpha:pkg", "//envoy/config/transport_socket/alts/v2alpha:pkg", + "//envoy/config/transport_socket/tap/v2alpha:pkg", "//envoy/data/accesslog/v2:pkg", "//envoy/data/tap/v2alpha:pkg", "//envoy/service/accesslog/v2:pkg", diff --git a/envoy/admin/v3/BUILD b/envoy/admin/v3/BUILD index 548dc419..507cffde 100644 --- a/envoy/admin/v3/BUILD +++ b/envoy/admin/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/admin/v2alpha:pkg", "//envoy/config/bootstrap/v3:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", diff --git a/envoy/config/accesslog/v3/BUILD b/envoy/config/accesslog/v3/BUILD index 27f78285..7e5e77fc 100644 --- a/envoy/config/accesslog/v3/BUILD +++ b/envoy/config/accesslog/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/accesslog/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/v3:pkg", diff --git a/envoy/config/bootstrap/v3/BUILD b/envoy/config/bootstrap/v3/BUILD index 48e8fb52..23067e57 100644 --- a/envoy/config/bootstrap/v3/BUILD +++ b/envoy/config/bootstrap/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/accesslog/v3:pkg", - "//envoy/config/bootstrap/v2:pkg", "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/listener/v3:pkg", diff --git a/envoy/config/cluster/v3/BUILD b/envoy/config/cluster/v3/BUILD index 92530e0f..21528bbc 100644 --- a/envoy/config/cluster/v3/BUILD +++ b/envoy/config/cluster/v3/BUILD @@ -7,8 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/cluster:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", "//envoy/type/v3:pkg", diff --git a/envoy/config/core/v3/BUILD b/envoy/config/core/v3/BUILD index 3fbb6b0e..812e942f 100644 --- a/envoy/config/core/v3/BUILD +++ b/envoy/config/core/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2/core:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/envoy/config/endpoint/v3/BUILD b/envoy/config/endpoint/v3/BUILD index 420cd087..ad2fc9a9 100644 --- a/envoy/config/endpoint/v3/BUILD +++ b/envoy/config/endpoint/v3/BUILD @@ -6,8 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2:pkg", - "//envoy/api/v2/endpoint:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/envoy/config/listener/v3/BUILD b/envoy/config/listener/v3/BUILD index bea12662..c2d6c133 100644 --- a/envoy/config/listener/v3/BUILD +++ b/envoy/config/listener/v3/BUILD @@ -7,11 +7,8 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/listener:pkg", "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/listener/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@com_github_cncf_udpa//xds/core/v3:pkg", diff --git a/envoy/config/metrics/v3/BUILD b/envoy/config/metrics/v3/BUILD index 6de4af36..3f3a5395 100644 --- a/envoy/config/metrics/v3/BUILD +++ b/envoy/config/metrics/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/metrics/v2:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/config/overload/v3/BUILD b/envoy/config/overload/v3/BUILD index 9fdea99c..9a76b7e1 100644 --- a/envoy/config/overload/v3/BUILD +++ b/envoy/config/overload/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/overload/v2alpha:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/config/route/v3/BUILD b/envoy/config/route/v3/BUILD index b82843ee..385c2c8c 100644 --- a/envoy/config/route/v3/BUILD +++ b/envoy/config/route/v3/BUILD @@ -7,8 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", - "//envoy/api/v2/route:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/matcher/v3:pkg", "//envoy/type/metadata/v3:pkg", diff --git a/envoy/config/tap/v3/BUILD b/envoy/config/tap/v3/BUILD index 416ccc0f..a457820f 100644 --- a/envoy/config/tap/v3/BUILD +++ b/envoy/config/tap/v3/BUILD @@ -10,7 +10,6 @@ api_proto_package( "//envoy/config/common/matcher/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/route/v3:pkg", - "//envoy/service/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/config/trace/v3/BUILD b/envoy/config/trace/v3/BUILD index ec0d9dd6..94596540 100644 --- a/envoy/config/trace/v3/BUILD +++ b/envoy/config/trace/v3/BUILD @@ -8,8 +8,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/trace/v2:pkg", - "//envoy/config/trace/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@opencensus_proto//opencensus/proto/trace/v1:trace_config_proto", ], diff --git a/envoy/data/accesslog/v3/BUILD b/envoy/data/accesslog/v3/BUILD index 9065b1b5..1c1a6f6b 100644 --- a/envoy/data/accesslog/v3/BUILD +++ b/envoy/data/accesslog/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/data/accesslog/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/data/tap/v3/BUILD b/envoy/data/tap/v3/BUILD index 7cdbc28e..1c1a6f6b 100644 --- a/envoy/data/tap/v3/BUILD +++ b/envoy/data/tap/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/data/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/extensions/common/ratelimit/v3/BUILD b/envoy/extensions/common/ratelimit/v3/BUILD index 660d629a..9a76b7e1 100644 --- a/envoy/extensions/common/ratelimit/v3/BUILD +++ b/envoy/extensions/common/ratelimit/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/api/v2/ratelimit:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/extensions/filters/common/fault/v3/BUILD b/envoy/extensions/filters/common/fault/v3/BUILD index f1a78308..9a76b7e1 100644 --- a/envoy/extensions/filters/common/fault/v3/BUILD +++ b/envoy/extensions/filters/common/fault/v3/BUILD @@ -6,7 +6,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ - "//envoy/config/filter/fault/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/extensions/filters/network/http_connection_manager/v3/BUILD b/envoy/extensions/filters/network/http_connection_manager/v3/BUILD index 55b63248..b244acf9 100644 --- a/envoy/extensions/filters/network/http_connection_manager/v3/BUILD +++ b/envoy/extensions/filters/network/http_connection_manager/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/http_connection_manager/v2:pkg", "//envoy/config/route/v3:pkg", "//envoy/config/trace/v3:pkg", "//envoy/type/http/v3:pkg", diff --git a/envoy/extensions/filters/network/redis_proxy/v3/BUILD b/envoy/extensions/filters/network/redis_proxy/v3/BUILD index bbf96025..1c1a6f6b 100644 --- a/envoy/extensions/filters/network/redis_proxy/v3/BUILD +++ b/envoy/extensions/filters/network/redis_proxy/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/redis_proxy/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/extensions/filters/network/tcp_proxy/v3/BUILD b/envoy/extensions/filters/network/tcp_proxy/v3/BUILD index 67dc2ebc..16c00029 100644 --- a/envoy/extensions/filters/network/tcp_proxy/v3/BUILD +++ b/envoy/extensions/filters/network/tcp_proxy/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( deps = [ "//envoy/config/accesslog/v3:pkg", "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/tcp_proxy/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD index c24f669b..ee92fb65 100644 --- a/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD +++ b/envoy/extensions/filters/network/thrift_proxy/router/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/filter/thrift/router/v2alpha1:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/filters/network/thrift_proxy/v3/BUILD b/envoy/extensions/filters/network/thrift_proxy/v3/BUILD index ccacc557..6eb33fe8 100644 --- a/envoy/extensions/filters/network/thrift_proxy/v3/BUILD +++ b/envoy/extensions/filters/network/thrift_proxy/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/config/core/v3:pkg", - "//envoy/config/filter/network/thrift_proxy/v2alpha1:pkg", "//envoy/config/route/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/extensions/health_checkers/redis/v3/BUILD b/envoy/extensions/health_checkers/redis/v3/BUILD index 1cb4c615..ee92fb65 100644 --- a/envoy/extensions/health_checkers/redis/v3/BUILD +++ b/envoy/extensions/health_checkers/redis/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/health_checker/redis/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD b/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD index 3fb51ff1..ee92fb65 100644 --- a/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD +++ b/envoy/extensions/resource_monitors/fixed_heap/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/resource_monitor/fixed_heap/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/resource_monitors/injected_resource/v3/BUILD b/envoy/extensions/resource_monitors/injected_resource/v3/BUILD index 975b8fcb..ee92fb65 100644 --- a/envoy/extensions/resource_monitors/injected_resource/v3/BUILD +++ b/envoy/extensions/resource_monitors/injected_resource/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/resource_monitor/injected_resource/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD b/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD index 0eab79b8..ee92fb65 100644 --- a/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD +++ b/envoy/extensions/retry/host/omit_canary_hosts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/retry/omit_canary_hosts/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/retry/host/previous_hosts/v3/BUILD b/envoy/extensions/retry/host/previous_hosts/v3/BUILD index 88d9a6e2..ee92fb65 100644 --- a/envoy/extensions/retry/host/previous_hosts/v3/BUILD +++ b/envoy/extensions/retry/host/previous_hosts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/retry/previous_hosts/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/transport_sockets/alts/v3/BUILD b/envoy/extensions/transport_sockets/alts/v3/BUILD index 8a8435d8..ee92fb65 100644 --- a/envoy/extensions/transport_sockets/alts/v3/BUILD +++ b/envoy/extensions/transport_sockets/alts/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/config/transport_socket/alts/v2alpha:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/extensions/transport_sockets/tls/v3/BUILD b/envoy/extensions/transport_sockets/tls/v3/BUILD index 47b9b9ae..75026a89 100644 --- a/envoy/extensions/transport_sockets/tls/v3/BUILD +++ b/envoy/extensions/transport_sockets/tls/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2/auth:pkg", "//envoy/config/core/v3:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", diff --git a/envoy/service/accesslog/v3/BUILD b/envoy/service/accesslog/v3/BUILD index d44839fb..c913d31f 100644 --- a/envoy/service/accesslog/v3/BUILD +++ b/envoy/service/accesslog/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/data/accesslog/v3:pkg", - "//envoy/service/accesslog/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/service/auth/v3/BUILD b/envoy/service/auth/v3/BUILD index 0774dda2..f39e4f85 100644 --- a/envoy/service/auth/v3/BUILD +++ b/envoy/service/auth/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/auth/v2:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/cluster/v3/BUILD b/envoy/service/cluster/v3/BUILD index d3be4fae..9f2ae1e7 100644 --- a/envoy/service/cluster/v3/BUILD +++ b/envoy/service/cluster/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/discovery/v3/BUILD b/envoy/service/discovery/v3/BUILD index 074bab85..7753cfeb 100644 --- a/envoy/service/discovery/v3/BUILD +++ b/envoy/service/discovery/v3/BUILD @@ -7,9 +7,7 @@ licenses(["notice"]) # Apache 2 api_proto_package( has_services = True, deps = [ - "//envoy/api/v2:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/discovery/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/service/endpoint/v3/BUILD b/envoy/service/endpoint/v3/BUILD index d3be4fae..9f2ae1e7 100644 --- a/envoy/service/endpoint/v3/BUILD +++ b/envoy/service/endpoint/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/health/v3/BUILD b/envoy/service/health/v3/BUILD index 30ba1552..b2838399 100644 --- a/envoy/service/health/v3/BUILD +++ b/envoy/service/health/v3/BUILD @@ -11,7 +11,6 @@ api_proto_package( "//envoy/config/cluster/v3:pkg", "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/service/discovery/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/service/listener/v3/BUILD b/envoy/service/listener/v3/BUILD index d3be4fae..9f2ae1e7 100644 --- a/envoy/service/listener/v3/BUILD +++ b/envoy/service/listener/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/load_stats/v3/BUILD b/envoy/service/load_stats/v3/BUILD index d69e005b..1ee733dc 100644 --- a/envoy/service/load_stats/v3/BUILD +++ b/envoy/service/load_stats/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/config/endpoint/v3:pkg", - "//envoy/service/load_stats/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/service/metrics/v3/BUILD b/envoy/service/metrics/v3/BUILD index b266dfc5..b9a1679e 100644 --- a/envoy/service/metrics/v3/BUILD +++ b/envoy/service/metrics/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/config/core/v3:pkg", - "//envoy/service/metrics/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", "@prometheus_metrics_model//:client_model", ], diff --git a/envoy/service/ratelimit/v3/BUILD b/envoy/service/ratelimit/v3/BUILD index 222b9ac5..1cec1e02 100644 --- a/envoy/service/ratelimit/v3/BUILD +++ b/envoy/service/ratelimit/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/extensions/common/ratelimit/v3:pkg", - "//envoy/service/ratelimit/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/service/route/v3/BUILD b/envoy/service/route/v3/BUILD index d3be4fae..9f2ae1e7 100644 --- a/envoy/service/route/v3/BUILD +++ b/envoy/service/route/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/api/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/runtime/v3/BUILD b/envoy/service/runtime/v3/BUILD index fb6a1656..9f2ae1e7 100644 --- a/envoy/service/runtime/v3/BUILD +++ b/envoy/service/runtime/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/service/discovery/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/secret/v3/BUILD b/envoy/service/secret/v3/BUILD index fb6a1656..9f2ae1e7 100644 --- a/envoy/service/secret/v3/BUILD +++ b/envoy/service/secret/v3/BUILD @@ -8,7 +8,6 @@ api_proto_package( has_services = True, deps = [ "//envoy/annotations:pkg", - "//envoy/service/discovery/v2:pkg", "//envoy/service/discovery/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/status/v3/BUILD b/envoy/service/status/v3/BUILD index a7396396..45ec162b 100644 --- a/envoy/service/status/v3/BUILD +++ b/envoy/service/status/v3/BUILD @@ -10,7 +10,6 @@ api_proto_package( "//envoy/admin/v3:pkg", "//envoy/annotations:pkg", "//envoy/config/core/v3:pkg", - "//envoy/service/status/v2:pkg", "//envoy/type/matcher/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/service/tap/v3/BUILD b/envoy/service/tap/v3/BUILD index 5ee1ce55..8948f580 100644 --- a/envoy/service/tap/v3/BUILD +++ b/envoy/service/tap/v3/BUILD @@ -9,7 +9,6 @@ api_proto_package( deps = [ "//envoy/config/core/v3:pkg", "//envoy/data/tap/v3:pkg", - "//envoy/service/tap/v2alpha:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/type/matcher/v3/BUILD b/envoy/type/matcher/v3/BUILD index a117fd27..fb28aa0e 100644 --- a/envoy/type/matcher/v3/BUILD +++ b/envoy/type/matcher/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/annotations:pkg", - "//envoy/type/matcher:pkg", "//envoy/type/v3:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], diff --git a/envoy/type/metadata/v3/BUILD b/envoy/type/metadata/v3/BUILD index aa64935f..ee92fb65 100644 --- a/envoy/type/metadata/v3/BUILD +++ b/envoy/type/metadata/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/type/metadata/v2:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], ) diff --git a/envoy/type/tracing/v3/BUILD b/envoy/type/tracing/v3/BUILD index 38eb160d..c797ae66 100644 --- a/envoy/type/tracing/v3/BUILD +++ b/envoy/type/tracing/v3/BUILD @@ -7,7 +7,6 @@ licenses(["notice"]) # Apache 2 api_proto_package( deps = [ "//envoy/type/metadata/v3:pkg", - "//envoy/type/tracing/v2:pkg", "@com_github_cncf_udpa//udpa/annotations:pkg", ], ) diff --git a/envoy/type/v3/BUILD b/envoy/type/v3/BUILD index da3a8659..ee92fb65 100644 --- a/envoy/type/v3/BUILD +++ b/envoy/type/v3/BUILD @@ -5,8 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package") licenses(["notice"]) # Apache 2 api_proto_package( - deps = [ - "//envoy/type:pkg", - "@com_github_cncf_udpa//udpa/annotations:pkg", - ], + deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"], )