Skip to content

Commit 2737c7d

Browse files
mmorel-35mmorel-35
authored
chore: update xds (#41746)
Signed-off-by: Matthieu MOREL <[email protected]>
1 parent 78cff07 commit 2737c7d

File tree

7 files changed

+39
-96
lines changed

7 files changed

+39
-96
lines changed

‎api/bazel/pgv.patch‎

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

‎api/bazel/repositories.bzl‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ def api_dependencies(bzlmod = False):
3737
)
3838
external_http_archive(
3939
name = "com_envoyproxy_protoc_gen_validate",
40-
patch_args = ["-p1"],
41-
patches = ["@envoy_api//bazel:pgv.patch"],
4240
)
4341
external_http_archive(
4442
name = "com_google_googleapis",

‎api/bazel/repository_locations.bzl‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,11 @@ REPOSITORY_LOCATIONS_SPEC = dict(
1717
project_desc = "protoc plugin to generate polyglot message validators",
1818
project_url = "https://github.com/bufbuild/protoc-gen-validate",
1919
use_category = ["api"],
20-
sha256 = "9372f9ecde8fbadf83c8c7de3dbb49b11067aa26fb608c501106d0b4bf06c28f",
21-
version = "1.0.4",
20+
sha256 = "ab51e978326b87e06be7a12fc6496f3ff6586339043557dbbd31f622332a5d45",
21+
version = "1.2.1",
2222
urls = ["https://github.com/bufbuild/protoc-gen-validate/archive/refs/tags/v{version}.zip"],
2323
strip_prefix = "protoc-gen-validate-{version}",
24-
release_date = "2024-01-17",
24+
release_date = "2025-01-22",
2525
implied_untracked_deps = [
2626
"com_github_iancoleman_strcase",
2727
"com_github_lyft_protoc_gen_star_v2",
@@ -52,9 +52,9 @@ REPOSITORY_LOCATIONS_SPEC = dict(
5252
project_desc = "xDS API Working Group (xDS-WG)",
5353
project_url = "https://github.com/cncf/xds",
5454
# During the UDPA -> xDS migration, we aren't working with releases.
55-
version = "2ee22ca5838277e4cff0f0219b1c62e5c0cd3cc1",
56-
sha256 = "34d450522f7b2a1d66a923d12616ace6baca0596bbd7edcbb21c39c41fc8527f",
57-
release_date = "2025-10-14",
55+
version = "5cf4b19495289a9e992ce5e2c3ffb08f2cf387be",
56+
sha256 = "a4746515f380b364497803881a4fb85296d3c141e8a507716fb5924686f129f9",
57+
release_date = "2025-10-31",
5858
strip_prefix = "xds-{version}",
5959
urls = ["https://github.com/cncf/xds/archive/{version}.tar.gz"],
6060
use_category = ["api"],

‎bazel/dependency_imports.bzl‎

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -90,62 +90,53 @@ def envoy_dependency_imports(
9090

9191
setup_sanitizer_libs()
9292

93+
protoc_gen_jsonschema_go_dependencies()
94+
9395
# These dependencies, like most of the Go in this repository, exist only for the API.
9496
# These repos also have transient dependencies - `build_external` allows them to use them.
9597
# TODO(phlax): remove `build_external` and pin all transients
9698
go_repository(
9799
name = "org_golang_google_grpc",
98100
build_file_proto_mode = "disable",
99101
importpath = "google.golang.org/grpc",
100-
sum = "h1:raiipEjMOIC/TO2AvyTxP25XFdLxNIBwzDh3FM3XztI=",
101-
version = "v1.34.0",
102+
sum = "h1:aHQeeJbo8zAkAa3pRzrVjZlbz6uSfeOXlJNQM0RAbz0=",
103+
version = "v1.68.0",
102104
build_external = "external",
103-
# project_url = "https://pkg.go.dev/google.golang.org/grpc",
104-
# last_update = "2020-12-02"
105-
# use_category = ["api"],
106-
# cpe = "cpe:2.3:a:grpc:grpc:*",
107105
)
108106
go_repository(
109107
name = "org_golang_x_net",
110108
importpath = "golang.org/x/net",
111-
sum = "h1:0mm1VjtFUOIlE1SbDlwjYaDxZVDP2S5ou6y0gSgXHu8=",
112-
version = "v0.0.0-20200226121028-0de0cce0169b",
109+
sum = "h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=",
110+
version = "v0.34.0",
113111
build_external = "external",
114-
# project_url = "https://pkg.go.dev/golang.org/x/net",
115-
# last_update = "2020-02-26"
116-
# use_category = ["api"],
117-
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L129-L134"
118112
)
119113
go_repository(
120114
name = "org_golang_x_text",
121115
importpath = "golang.org/x/text",
122-
sum = "h1:cokOdA+Jmi5PJGXLlLllQSgYigAEfHXJAERHVMaCc2k=",
123-
version = "v0.3.3",
116+
sum = "h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo=",
117+
version = "v0.21.0",
124118
build_external = "external",
125-
# project_url = "https://pkg.go.dev/golang.org/x/text",
126-
# last_update = "2021-06-16"
127-
# use_category = ["api"],
128-
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L148-L153"
129119
)
130120
go_repository(
131121
name = "org_golang_google_genproto_googleapis_api",
132122
importpath = "google.golang.org/genproto/googleapis/api",
133-
sum = "h1:DoPTO70H+bcDXcd39vOqb2viZxgqeBeSGtZ55yZU4/Q=",
134-
version = "v0.0.0-20230822172742-b8732ec3820d",
123+
sum = "h1:+2XxjfsAu6vqFxwGBRcHiMaDCuZiqXGDUDVWVtrFAnE=",
124+
version = "v0.0.0-20251029180050-ab9386a59fda",
135125
build_external = "external",
136126
)
137127
go_repository(
138128
name = "org_golang_google_genproto_googleapis_rpc",
139129
importpath = "google.golang.org/genproto/googleapis/rpc",
140-
sum = "h1:uvYuEyMHKNt+lT4K3bN6fGswmK8qSvcreM3BwjDh+y4=",
141-
version = "v0.0.0-20230822172742-b8732ec3820d",
130+
sum = "h1:i/Q+bfisr7gq6feoJnS/DlpdwEL4ihp41fvRiM3Ork0=",
131+
version = "v0.0.0-20251029180050-ab9386a59fda",
142132
build_external = "external",
143133
)
144134
go_repository(
145135
name = "org_golang_google_protobuf",
136+
build_file_proto_mode = "disable",
146137
importpath = "google.golang.org/protobuf",
147-
sum = "h1:d0NfwRgPtno5B1Wa6L2DAG+KivqkdutMf1UhdNx175w=",
148-
version = "v1.28.1",
138+
sum = "h1:AYd7cD/uASjIL6Q9LiTjz8JLcrh/88q5UObnmY3aOOE=",
139+
version = "v1.36.10",
149140
build_external = "external",
150141
)
151142
go_repository(
@@ -158,35 +149,23 @@ def envoy_dependency_imports(
158149
go_repository(
159150
name = "com_github_spf13_afero",
160151
importpath = "github.com/spf13/afero",
161-
sum = "h1:8q6vk3hthlpb2SouZcnBVKboxWQWMDNF38bwholZrJc=",
162-
version = "v1.3.4",
152+
sum = "h1:EaGW2JJh15aKOejeuJ+wpFSHnbd7GE6Wvp3TsNhb6LY=",
153+
version = "v1.10.0",
163154
build_external = "external",
164-
# project_url = "https://pkg.go.dev/github.com/spf13/afero",
165-
# last_update = "2021-03-20"
166-
# use_category = ["api"],
167-
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L60-L65"
168155
)
169156
go_repository(
170157
name = "com_github_lyft_protoc_gen_star_v2",
171158
importpath = "github.com/lyft/protoc-gen-star/v2",
172-
sum = "h1:keaAo8hRuAT0O3DfJ/wM3rufbAjGeJ1lAtWZHDjKGB0=",
173-
version = "v2.0.1",
159+
sum = "h1:sIXJOMrYnQZJu7OB7ANSF4MYri2fTEGIsRLz6LwI4xE=",
160+
version = "v2.0.4-0.20230330145011-496ad1ac90a4",
174161
build_external = "external",
175-
# project_url = "https://pkg.go.dev/github.com/lyft/protoc-gen-star",
176-
# last_update = "2023-01-06"
177-
# use_category = ["api"],
178-
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.10.1/dependencies.bzl#L35-L40"
179162
)
180163
go_repository(
181164
name = "com_github_iancoleman_strcase",
182165
importpath = "github.com/iancoleman/strcase",
183-
sum = "h1:ux/56T2xqZO/3cP1I2F86qpeoYPCOzk+KF/UH/Ar+lk=",
184-
version = "v0.0.0-20180726023541-3605ed457bf7",
166+
sum = "h1:nTXanmYxhfFAMjZL34Ov6gkzEsSJZ5DbhxWjvSASxEI=",
167+
version = "v0.3.0",
185168
build_external = "external",
186-
# project_url = "https://pkg.go.dev/github.com/iancoleman/strcase",
187-
# last_update = "2020-11-22"
188-
# use_category = ["api"],
189-
# source = "https://github.com/bufbuild/protoc-gen-validate/blob/v0.6.1/dependencies.bzl#L23-L28"
190169
)
191170
go_repository(
192171
name = "com_github_planetscale_vtprotobuf",
@@ -196,7 +175,6 @@ def envoy_dependency_imports(
196175
build_external = "external",
197176
)
198177

199-
protoc_gen_jsonschema_go_dependencies()
200178
rules_proto_grpc_toolchains()
201179

202180
def envoy_download_go_sdks(go_version):

‎contrib/golang/router/cluster_specifier/test/test_data/simple/go.mod‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
module example.com/routeconfig
22

3-
go 1.23
3+
go 1.24.6
44

55
require (
6-
github.com/cncf/xds/go v0.0.0-20231128003011-0fa0005c9caa
7-
github.com/envoyproxy/envoy v1.33.2
8-
)
9-
10-
require (
11-
google.golang.org/genproto/googleapis/api v0.0.0-20240102182953-50ed04b92917 // indirect
12-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240102182953-50ed04b92917 // indirect
6+
github.com/cncf/xds/go v0.0.0-20251031190108-5cf4b1949528
7+
github.com/envoyproxy/envoy v1.36.2
8+
google.golang.org/protobuf v1.36.10
139
)
1410

1511
require (
16-
github.com/envoyproxy/protoc-gen-validate v1.0.2 // indirect
17-
github.com/golang/protobuf v1.5.3 // indirect
18-
google.golang.org/protobuf v1.36.10
12+
cel.dev/expr v0.24.0 // indirect
13+
github.com/envoyproxy/protoc-gen-validate v1.2.1 // indirect
14+
google.golang.org/genproto/googleapis/api v0.0.0-20251029180050-ab9386a59fda // indirect
15+
google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect
1916
)
2017

2118
replace github.com/envoyproxy/envoy => ../../../../../../../

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module github.com/envoyproxy/envoy
22

3-
go 1.23
3+
go 1.24.6
44

55
require google.golang.org/protobuf v1.36.10

‎mobile/WORKSPACE‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
55

66
http_archive(
77
name = "bazel_gazelle",
8-
sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002",
8+
sha256 = "e467b801046b6598c657309b45d2426dc03513777bd1092af2c62eebf990aca5",
99
urls = [
10-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
11-
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz",
10+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz",
11+
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.45.0/bazel-gazelle-v0.45.0.tar.gz",
1212
],
1313
)
1414

0 commit comments

Comments
 (0)