Skip to content

Commit 009cec3

Browse files
sfleensfleen
authored
chore(deps): Upgrade linkerd2-proxy-api and tonic group (#14699)
* chore(deps): Upgrade `linkerd2-proxy-api` and `tonic` group - linkerd2-proxy-api: v0.18.0 - tonic: v0.14 - prost: v0.14 Signed-off-by: Scott Fleener <[email protected]> * chore(deny): Remove unnecessary cargo deny exemptions Signed-off-by: Scott Fleener <[email protected]> --------- Signed-off-by: Scott Fleener <[email protected]>
1 parent 224693e commit 009cec3

File tree

6 files changed

+33
-39
lines changed

6 files changed

+33
-39
lines changed

‎Cargo.lock‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1006,7 +1006,7 @@ dependencies = [
10061006
"hyper",
10071007
"libc",
10081008
"pin-project-lite",
1009-
"socket2 0.6.0",
1009+
"socket2",
10101010
"tokio",
10111011
"tower-service",
10121012
"tracing",
@@ -1544,16 +1544,17 @@ dependencies = [
15441544

15451545
[[package]]
15461546
name = "linkerd2-proxy-api"
1547-
version = "0.17.0"
1547+
version = "0.18.0"
15481548
source = "registry+https://github.com/rust-lang/crates.io-index"
1549-
checksum = "bb83fdbbcea49285182d75aacc20ced8ebce60030be1d72d87b00f58f07d267d"
1549+
checksum = "ba9e3b341ca4992feaf43a4d2bdbfe2081aa3e2b9a503753544ce55242af6342"
15501550
dependencies = [
15511551
"http",
15521552
"ipnet",
15531553
"prost",
15541554
"prost-types",
15551555
"thiserror 2.0.17",
15561556
"tonic",
1557+
"tonic-prost",
15571558
]
15581559

15591560
[[package]]
@@ -1915,19 +1916,19 @@ dependencies = [
19151916

19161917
[[package]]
19171918
name = "prost"
1918-
version = "0.13.5"
1919+
version = "0.14.1"
19191920
source = "registry+https://github.com/rust-lang/crates.io-index"
1920-
checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
1921+
checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
19211922
dependencies = [
19221923
"bytes",
19231924
"prost-derive",
19241925
]
19251926

19261927
[[package]]
19271928
name = "prost-derive"
1928-
version = "0.13.5"
1929+
version = "0.14.1"
19291930
source = "registry+https://github.com/rust-lang/crates.io-index"
1930-
checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
1931+
checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
19311932
dependencies = [
19321933
"anyhow",
19331934
"itertools 0.14.0",
@@ -1938,9 +1939,9 @@ dependencies = [
19381939

19391940
[[package]]
19401941
name = "prost-types"
1941-
version = "0.13.5"
1942+
version = "0.14.1"
19421943
source = "registry+https://github.com/rust-lang/crates.io-index"
1943-
checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
1944+
checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
19441945
dependencies = [
19451946
"prost",
19461947
]
@@ -2356,16 +2357,6 @@ version = "1.15.1"
23562357
source = "registry+https://github.com/rust-lang/crates.io-index"
23572358
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
23582359

2359-
[[package]]
2360-
name = "socket2"
2361-
version = "0.5.10"
2362-
source = "registry+https://github.com/rust-lang/crates.io-index"
2363-
checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
2364-
dependencies = [
2365-
"libc",
2366-
"windows-sys 0.52.0",
2367-
]
2368-
23692360
[[package]]
23702361
name = "socket2"
23712362
version = "0.6.0"
@@ -2466,7 +2457,7 @@ dependencies = [
24662457
"parking_lot",
24672458
"pin-project-lite",
24682459
"signal-hook-registry",
2469-
"socket2 0.6.0",
2460+
"socket2",
24702461
"tokio-macros",
24712462
"windows-sys 0.61.0",
24722463
]
@@ -2557,9 +2548,9 @@ dependencies = [
25572548

25582549
[[package]]
25592550
name = "tonic"
2560-
version = "0.13.1"
2551+
version = "0.14.2"
25612552
source = "registry+https://github.com/rust-lang/crates.io-index"
2562-
checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
2553+
checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
25632554
dependencies = [
25642555
"async-trait",
25652556
"axum",
@@ -2574,8 +2565,8 @@ dependencies = [
25742565
"hyper-util",
25752566
"percent-encoding",
25762567
"pin-project",
2577-
"prost",
2578-
"socket2 0.5.10",
2568+
"socket2",
2569+
"sync_wrapper",
25792570
"tokio",
25802571
"tokio-stream",
25812572
"tower",
@@ -2584,6 +2575,17 @@ dependencies = [
25842575
"tracing",
25852576
]
25862577

2578+
[[package]]
2579+
name = "tonic-prost"
2580+
version = "0.14.2"
2581+
source = "registry+https://github.com/rust-lang/crates.io-index"
2582+
checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
2583+
dependencies = [
2584+
"bytes",
2585+
"prost",
2586+
"tonic",
2587+
]
2588+
25872589
[[package]]
25882590
name = "tower"
25892591
version = "0.5.2"

‎Cargo.toml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ k8s-openapi = { version = "0.25", features = ["v1_33"] }
2222
kube = { version = "1.1", default-features = false }
2323
kubert = { version = "0.25", default-features = false }
2424
prometheus-client = { version = "0.23", default-features = false }
25-
tonic = { version = "0.13", default-features = false }
25+
tonic = { version = "0.14", default-features = false }
2626
tower = { version = "0.5", default-features = false }
2727

2828
linkerd-policy-controller = { path = "./policy-controller" }
@@ -47,5 +47,5 @@ path = "./policy-controller/runtime"
4747
default-features = false
4848

4949
[workspace.dependencies.linkerd2-proxy-api]
50-
version = "0.17.0"
50+
version = "0.18.0"
5151
features = ["inbound", "outbound"]

‎deny.toml‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,7 @@ multiple-versions = "deny"
5050
# Wildcard dependencies are used for all workspace-local crates.
5151
wildcards = "allow"
5252
highlight = "all"
53-
skip = [
54-
# https://github.com/hawkw/matchers/pull/4
55-
{ name = "regex-automata", version = "0.1" },
56-
{ name = "regex-syntax", version = "0.6" },
57-
]
53+
skip = []
5854
skip-tree = [
5955
# `serde_json` and `h2` depend on diverged versions of `indexmap` (2.0.x and
6056
# 1.9.x, respectively)
@@ -63,10 +59,6 @@ skip-tree = [
6359
{ name = "thiserror", version = "1" },
6460
# getrandom v0.3 is still making its way through the ecosystem
6561
{ name = "getrandom", version = "0.2" },
66-
# zerocopy v0.8 is still making its way through the ecosystem
67-
{ name = "zerocopy", version = "0.7" },
68-
# tonic 0.13 still uses socket2 0.5
69-
{ name = "socket2", version = "0.5" },
7062
]
7163

7264
[sources]

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ require (
2020
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
2121
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2222
github.com/julienschmidt/httprouter v1.3.0
23-
github.com/linkerd/linkerd2-proxy-api v0.17.0
23+
github.com/linkerd/linkerd2-proxy-api v0.18.0
2424
github.com/mattn/go-isatty v0.0.20
2525
github.com/mattn/go-runewidth v0.0.19
2626
github.com/nsf/termbox-go v1.1.1

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,8 +284,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
284284
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
285285
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
286286
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
287-
github.com/linkerd/linkerd2-proxy-api v0.17.0 h1:PuSBnDjRjlhIKb2+MfuH9u264gzLTNVDn+JuL09EuRc=
288-
github.com/linkerd/linkerd2-proxy-api v0.17.0/go.mod h1:5Q1jpVNSuhStpBHjW3PGvBrRGWaGBCWCgbTac6/oeVs=
287+
github.com/linkerd/linkerd2-proxy-api v0.18.0 h1:6hAI0DjDObjI716GqsR4VrddnEJkMY7+H3HwNM5Tzvo=
288+
github.com/linkerd/linkerd2-proxy-api v0.18.0/go.mod h1:n7Sb/skuU8VDP/8TVZHeiAmB1QPFP4kygQkcsPzx3rI=
289289
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
290290
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
291291
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=

‎policy-controller/grpc/Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ http = { workspace = true }
1414
hyper = { workspace = true, features = ["http2", "server"] }
1515
maplit = "1"
1616
prometheus-client = { workspace = true }
17-
prost-types = "0.13"
17+
prost-types = "0.14"
1818
serde = { version = "1", features = ["derive"] }
1919
serde_json = "1"
2020
tokio = { version = "1", features = ["macros", "time"] }

0 commit comments

Comments
 (0)