bazel: rename `@com_github_cncf_udpa` to `@com_github_cncf_xds` (#30802)

The repo has been renamed from cncf/udpa to cncf/xds long time ago, this is just to reflect this in the bazel repo name.
Otherwise this is a noop.

Risk Level: Low
Testing: do_ci.sh

Signed-off-by: Sergii Tkachenko <sergiitk@google.com>

Mirrored from https://github.com/envoyproxy/envoy @ f66bd34bf2060e71516456354202abb8ea23ba71

BUILD

@@ -366,9 +366,9 @@ proto_library(
     name = "xds_protos",
     visibility = ["//visibility:public"],
     deps = [
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/v3:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//xds/type/v3:pkg",
     ],
 )
 

STYLE.md

@@ -126,7 +126,7 @@ To add an extension config to the API, the steps below should be followed:
    licenses(["notice"])  # Apache 2
 
    api_proto_package(
-       deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+       deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
    )
    ```
 1. If this is still WiP and subject to breaking changes, please tag it

bazel/external_proto_deps.bzl

@@ -22,7 +22,7 @@ EXTERNAL_PROTO_GO_BAZEL_DEP_MAP = {
     # Note @com_google_googleapis are point to @go_googleapis.
     #
     # It is aligned to xDS dependency to suppress the conflicting package heights error between
-    # @com_github_cncf_udpa//xds/type/matcher/v3:pkg_go_proto
+    # @com_github_cncf_xds//xds/type/matcher/v3:pkg_go_proto
     # @envoy_api//envoy/config/rbac/v3:pkg_go_proto
     #
     # TODO(https://github.com/bazelbuild/rules_go/issues/1986): update to

bazel/repositories.bzl

@@ -25,8 +25,15 @@ def api_dependencies():
         name = "com_google_googleapis",
     )
 
+    external_http_archive(
+        name = "com_github_cncf_xds",
+    )
+
+    # Needed until @com_github_grpc_grpc renames @com_github_cncf_udpa
+    # to @com_github_cncf_xds as well.
     external_http_archive(
         name = "com_github_cncf_udpa",
+        location_name = "com_github_cncf_xds",
     )
 
     external_http_archive(

bazel/repository_locations.bzl

@@ -34,7 +34,7 @@ REPOSITORY_LOCATIONS_SPEC = dict(
         license = "Apache-2.0",
         license_url = "https://github.com/bufbuild/protoc-gen-validate/blob/v{version}/LICENSE",
     ),
-    com_github_cncf_udpa = dict(
+    com_github_cncf_xds = dict(
         project_name = "xDS API",
         project_desc = "xDS API Working Group (xDS-WG)",
         project_url = "https://github.com/cncf/xds",

contrib/envoy/extensions/config/v3alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/key_value/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/filters/http/checksum/v3alpha/BUILD

@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/http/dynamo/v3/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/http/golang/v3alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/http/language/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/http/squash/v3/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/http/sxg/v3alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/client_ssl_auth/v3/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/generic_proxy/action/v3/BUILD

@@ -8,7 +8,7 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/generic_proxy/codecs/dubbo/v3/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/generic_proxy/matcher/v3/BUILD

@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/generic_proxy/router/v3/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/generic_proxy/v3/BUILD

@@ -9,8 +9,8 @@ api_proto_package(
         "//envoy/config/accesslog/v3:pkg",
         "//envoy/config/core/v3:pkg",
         "//envoy/extensions/filters/network/http_connection_manager/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/type/matcher/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/type/matcher/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/golang/v3alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/kafka_broker/v3/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/network/kafka_mesh/v3alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/mysql_proxy/v3/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/network/postgres_proxy/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/network/rocketmq_proxy/v3/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/sip_proxy/router/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     has_services = True,
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/filters/network/sip_proxy/v3alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//contrib/envoy/extensions/filters/network/sip_proxy/tra/v3alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/matching/input_matchers/hyperscan/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/network/connection_balance/dlb/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/private_key_providers/cryptomb/v3alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/private_key_providers/qat/v3alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

contrib/envoy/extensions/regex_engines/hyperscan/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

contrib/envoy/extensions/router/cluster_specifier/golang/v3alpha/BUILD

@@ -6,7 +6,7 @@ licenses(["notice"])  # Apache 2
 
 api_proto_package(
     deps = [
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

contrib/envoy/extensions/vcl/v3alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/admin/v2alpha/BUILD

@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/bootstrap/v2:pkg",
         "//envoy/service/tap/v2alpha:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/admin/v3/BUILD

@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/tap/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/BUILD

@@ -17,6 +17,6 @@ api_proto_package(
         "//envoy/config/filter/accesslog/v2:pkg",
         "//envoy/config/listener/v2:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/auth/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/cluster/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/core/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/endpoint/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/listener/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/auth:pkg",
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/api/v2/ratelimit/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/api/v2/route/BUILD

@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
         "//envoy/type/tracing/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/accesslog/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/accesslog/v3/BUILD

@@ -11,6 +11,6 @@ api_proto_package(
         "//envoy/data/accesslog/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/bootstrap/v2/BUILD

@@ -13,6 +13,6 @@ api_proto_package(
         "//envoy/config/metrics/v2:pkg",
         "//envoy/config/overload/v2alpha:pkg",
         "//envoy/config/trace/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/bootstrap/v3/BUILD

@@ -16,6 +16,6 @@ api_proto_package(
         "//envoy/config/trace/v3:pkg",
         "//envoy/extensions/transport_sockets/tls/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/cluster/aggregate/v2alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/cluster/dynamic_forward_proxy/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/cluster/redis/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/cluster/v3/BUILD

@@ -11,7 +11,7 @@ api_proto_package(
         "//envoy/config/endpoint/v3:pkg",
         "//envoy/type/metadata/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
     ],
 )

envoy/config/common/dynamic_forward_proxy/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/common/key_value/v3/BUILD

@@ -7,7 +7,7 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
     ],
 )

envoy/config/common/matcher/v3/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/config/core/v3:pkg",
         "//envoy/config/route/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/common/mutation_rules/v3/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/matcher/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/common/tap/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/service/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/core/v3/BUILD

@@ -9,8 +9,8 @@ api_proto_package(
         "//envoy/annotations:pkg",
         "//envoy/type/matcher/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
-        "@com_github_cncf_udpa//xds/annotations/v3:pkg",
-        "@com_github_cncf_udpa//xds/core/v3:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
+        "@com_github_cncf_xds//xds/annotations/v3:pkg",
+        "@com_github_cncf_xds//xds/core/v3:pkg",
     ],
 )

envoy/config/endpoint/v3/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/config/core/v3:pkg",
         "//envoy/type/v3:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/accesslog/v2/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/dubbo/router/v2alpha1/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/fault/v2/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/annotations:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/adaptive_concurrency/v2alpha/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/aws_lambda/v2alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/aws_request_signing/v2alpha/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/buffer/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/cache/v2alpha/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/route:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/compressor/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/cors/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/csrf/v2/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/dynamic_forward_proxy/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/dynamic_forward_proxy/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/dynamo/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/ext_authz/v2/BUILD

@@ -10,6 +10,6 @@ api_proto_package(
         "//envoy/api/v2/core:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/fault/v2/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/route:pkg",
         "//envoy/config/filter/fault/v2:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/grpc_http1_bridge/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/grpc_http1_reverse_bridge/v2alpha1/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/grpc_stats/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/grpc_web/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/gzip/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/filter/http/compressor/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/header_to_metadata/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/health_check/v2/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/ip_tagging/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/jwt_authn/v2alpha/BUILD

@@ -8,6 +8,6 @@ api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
         "//envoy/api/v2/route:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/lua/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/on_demand/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/original_src/v2alpha1/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/rate_limit/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/ratelimit/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/rbac/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/rbac/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/router/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/filter/accesslog/v2:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/squash/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/http/tap/v2alpha/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/config/common/tap/v2alpha:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/http/transcoder/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/listener/http_inspector/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/listener/original_dst/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/listener/original_src/v2alpha1/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/listener/proxy_protocol/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/listener/tls_inspector/v2/BUILD

@@ -5,5 +5,5 @@ load("@envoy_api//bazel:api_build_system.bzl", "api_proto_package")
 licenses(["notice"])  # Apache 2
 
 api_proto_package(
-    deps = ["@com_github_cncf_udpa//udpa/annotations:pkg"],
+    deps = ["@com_github_cncf_xds//udpa/annotations:pkg"],
 )

envoy/config/filter/network/client_ssl_auth/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/network/direct_response/v2/BUILD

@@ -7,6 +7,6 @@ licenses(["notice"])  # Apache 2
 api_proto_package(
     deps = [
         "//envoy/api/v2/core:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )

envoy/config/filter/network/dubbo_proxy/v2alpha1/BUILD

@@ -9,6 +9,6 @@ api_proto_package(
         "//envoy/api/v2/route:pkg",
         "//envoy/type:pkg",
         "//envoy/type/matcher:pkg",
-        "@com_github_cncf_udpa//udpa/annotations:pkg",
+        "@com_github_cncf_xds//udpa/annotations:pkg",
     ],
 )