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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 26 additions & 24 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1006,7 +1006,7 @@ dependencies = [
"hyper",
"libc",
"pin-project-lite",
"socket2 0.6.0",
"socket2",
"tokio",
"tower-service",
"tracing",
Expand Down Expand Up @@ -1544,16 +1544,17 @@ dependencies = [

[[package]]
name = "linkerd2-proxy-api"
version = "0.17.0"
version = "0.18.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bb83fdbbcea49285182d75aacc20ced8ebce60030be1d72d87b00f58f07d267d"
checksum = "ba9e3b341ca4992feaf43a4d2bdbfe2081aa3e2b9a503753544ce55242af6342"
dependencies = [
"http",
"ipnet",
"prost",
"prost-types",
"thiserror 2.0.17",
"tonic",
"tonic-prost",
]

[[package]]
Expand Down Expand Up @@ -1915,19 +1916,19 @@ dependencies = [

[[package]]
name = "prost"
version = "0.13.5"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2796faa41db3ec313a31f7624d9286acf277b52de526150b7e69f3debf891ee5"
checksum = "7231bd9b3d3d33c86b58adbac74b5ec0ad9f496b19d22801d773636feaa95f3d"
dependencies = [
"bytes",
"prost-derive",
]

[[package]]
name = "prost-derive"
version = "0.13.5"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
checksum = "9120690fafc389a67ba3803df527d0ec9cbbc9cc45e4cc20b332996dfb672425"
dependencies = [
"anyhow",
"itertools 0.14.0",
Expand All @@ -1938,9 +1939,9 @@ dependencies = [

[[package]]
name = "prost-types"
version = "0.13.5"
version = "0.14.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52c2c1bf36ddb1a1c396b3601a3cec27c2462e45f07c386894ec3ccf5332bd16"
checksum = "b9b4db3d6da204ed77bb26ba83b6122a73aeb2e87e25fbf7ad2e84c4ccbf8f72"
dependencies = [
"prost",
]
Expand Down Expand Up @@ -2356,16 +2357,6 @@ version = "1.15.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"

[[package]]
name = "socket2"
version = "0.5.10"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
dependencies = [
"libc",
"windows-sys 0.52.0",
]

[[package]]
name = "socket2"
version = "0.6.0"
Expand Down Expand Up @@ -2466,7 +2457,7 @@ dependencies = [
"parking_lot",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.6.0",
"socket2",
"tokio-macros",
"windows-sys 0.61.0",
]
Expand Down Expand Up @@ -2557,9 +2548,9 @@ dependencies = [

[[package]]
name = "tonic"
version = "0.13.1"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7e581ba15a835f4d9ea06c55ab1bd4dce26fc53752c69a04aac00703bfb49ba9"
checksum = "eb7613188ce9f7df5bfe185db26c5814347d110db17920415cf2fbcad85e7203"
dependencies = [
"async-trait",
"axum",
Expand All @@ -2574,8 +2565,8 @@ dependencies = [
"hyper-util",
"percent-encoding",
"pin-project",
"prost",
"socket2 0.5.10",
"socket2",
"sync_wrapper",
"tokio",
"tokio-stream",
"tower",
Expand All @@ -2584,6 +2575,17 @@ dependencies = [
"tracing",
]

[[package]]
name = "tonic-prost"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "66bd50ad6ce1252d87ef024b3d64fe4c3cf54a86fb9ef4c631fdd0ded7aeaa67"
dependencies = [
"bytes",
"prost",
"tonic",
]

[[package]]
name = "tower"
version = "0.5.2"
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ k8s-openapi = { version = "0.25", features = ["v1_33"] }
kube = { version = "1.1", default-features = false }
kubert = { version = "0.25", default-features = false }
prometheus-client = { version = "0.23", default-features = false }
tonic = { version = "0.13", default-features = false }
tonic = { version = "0.14", default-features = false }
tower = { version = "0.5", default-features = false }

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

[workspace.dependencies.linkerd2-proxy-api]
version = "0.17.0"
version = "0.18.0"
features = ["inbound", "outbound"]
10 changes: 1 addition & 9 deletions deny.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,7 @@ multiple-versions = "deny"
# Wildcard dependencies are used for all workspace-local crates.
wildcards = "allow"
highlight = "all"
skip = [
# https://github.com/hawkw/matchers/pull/4
{ name = "regex-automata", version = "0.1" },
{ name = "regex-syntax", version = "0.6" },
]
skip = []
skip-tree = [
# `serde_json` and `h2` depend on diverged versions of `indexmap` (2.0.x and
# 1.9.x, respectively)
Expand All @@ -63,10 +59,6 @@ skip-tree = [
{ name = "thiserror", version = "1" },
# getrandom v0.3 is still making its way through the ecosystem
{ name = "getrandom", version = "0.2" },
# zerocopy v0.8 is still making its way through the ecosystem
{ name = "zerocopy", version = "0.7" },
# tonic 0.13 still uses socket2 0.5
{ name = "socket2", version = "0.5" },
]

[sources]
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/grantae/certinfo v0.0.0-20170412194111-59d56a35515b
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/julienschmidt/httprouter v1.3.0
github.com/linkerd/linkerd2-proxy-api v0.17.0
github.com/linkerd/linkerd2-proxy-api v0.18.0
github.com/mattn/go-isatty v0.0.20
github.com/mattn/go-runewidth v0.0.19
github.com/nsf/termbox-go v1.1.1
Expand Down
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -284,8 +284,8 @@ github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0
github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
github.com/linkerd/linkerd2-proxy-api v0.17.0 h1:PuSBnDjRjlhIKb2+MfuH9u264gzLTNVDn+JuL09EuRc=
github.com/linkerd/linkerd2-proxy-api v0.17.0/go.mod h1:5Q1jpVNSuhStpBHjW3PGvBrRGWaGBCWCgbTac6/oeVs=
github.com/linkerd/linkerd2-proxy-api v0.18.0 h1:6hAI0DjDObjI716GqsR4VrddnEJkMY7+H3HwNM5Tzvo=
github.com/linkerd/linkerd2-proxy-api v0.18.0/go.mod h1:n7Sb/skuU8VDP/8TVZHeiAmB1QPFP4kygQkcsPzx3rI=
github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
Expand Down
2 changes: 1 addition & 1 deletion policy-controller/grpc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ http = { workspace = true }
hyper = { workspace = true, features = ["http2", "server"] }
maplit = "1"
prometheus-client = { workspace = true }
prost-types = "0.13"
prost-types = "0.14"
serde = { version = "1", features = ["derive"] }
serde_json = "1"
tokio = { version = "1", features = ["macros", "time"] }
Expand Down