Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
6 changes: 3 additions & 3 deletions api/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -363,9 +363,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",
],
)

Expand Down
2 changes: 1 addition & 1 deletion api/STYLE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/bazel/external_proto_deps.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
7 changes: 7 additions & 0 deletions api/bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion api/bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion api/contrib/envoy/extensions/config/v3alpha/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/contrib/envoy/extensions/filters/http/dynamo/v3/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
2 changes: 1 addition & 1 deletion api/contrib/envoy/extensions/filters/http/squash/v3/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/contrib/envoy/extensions/vcl/v3alpha/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
2 changes: 1 addition & 1 deletion api/envoy/admin/v2alpha/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/admin/v3/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/auth/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/cluster/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/core/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/endpoint/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/listener/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/ratelimit/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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"],
)
2 changes: 1 addition & 1 deletion api/envoy/api/v2/route/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/config/accesslog/v2/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
2 changes: 1 addition & 1 deletion api/envoy/config/accesslog/v3/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -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",
],
)
Loading