linkerd
/
linkerd2-proxy
mirror of https://github.com/linkerd/linkerd2-proxy.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sketch; upgrade

This commit is contained in:
katelyn martin 2024-12-01 00:00:00 +00:00
parent 62bd883e7d
commit d29313c06b
17 changed files with 230 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

309
Cargo.lock
View File

@ -147,6 +147,12 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "atomic-waker"
version = "1.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]] [[package]]
name = "autocfg" name = "autocfg"
version = "1.4.0" version = "1.4.0"
@ -166,7 +172,7 @@ dependencies = [
"futures-util", "futures-util",
"http 0.2.11", "http 0.2.11",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 0.14.31",
"itoa", "itoa",
"matchit", "matchit",
"memchr", "memchr",
@ -814,6 +820,25 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "h2"
version = "0.4.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ccae279728d634d083c00f6099cb58f01cc99c145b84b8be2f6c74618d79922e"
dependencies = [
"atomic-waker",
"bytes",
"fnv",
"futures-core",
"futures-sink",
"http 1.2.0",
"indexmap 2.7.0",
"slab",
"tokio",
"tokio-util",
"tracing",
]
[[package]] [[package]]
name = "hashbrown" name = "hashbrown"
version = "0.12.3" version = "0.12.3"
@ -943,6 +968,19 @@ dependencies = [
"http 1.2.0", "http 1.2.0",
] ]
[[package]]
name = "http-body-util"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
dependencies = [
"bytes",
"futures-util",
"http 1.2.0",
"http-body 1.0.1",
"pin-project-lite",
]
[[package]] [[package]]
name = "httparse" name = "httparse"
version = "1.9.5" version = "1.9.5"
@ -970,7 +1008,7 @@ dependencies = [
"futures-channel", "futures-channel",
"futures-core", "futures-core",
"futures-util", "futures-util",
"h2", "h2 0.3.26",
"http 0.2.11", "http 0.2.11",
"http-body 0.4.6", "http-body 0.4.6",
"httparse", "httparse",
@ -984,14 +1022,35 @@ dependencies = [
"want", "want",
] ]
[[package]]
name = "hyper"
version = "1.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "256fb8d4bd6413123cc9d91832d78325c48ff41677595be797d90f42969beae0"
dependencies = [
"bytes",
"futures-channel",
"futures-util",
"h2 0.4.7",
"http 1.2.0",
"http-body 1.0.1",
"httparse",
"httpdate",
"itoa",
"pin-project-lite",
"smallvec",
"tokio",
"want",
]
[[package]] [[package]]
name = "hyper-balance" name = "hyper-balance"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"pin-project", "pin-project",
"tokio", "tokio",
"tokio-test", "tokio-test",
@ -1004,7 +1063,7 @@ version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1" checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
dependencies = [ dependencies = [
"hyper", "hyper 0.14.31",
"pin-project-lite", "pin-project-lite",
"tokio", "tokio",
"tokio-io-timeout", "tokio-io-timeout",
@ -1300,7 +1359,7 @@ checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
name = "linkerd-addr" name = "linkerd-addr"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"http 0.2.11", "http 1.2.0",
"ipnet", "ipnet",
"linkerd-dns-name", "linkerd-dns-name",
"thiserror 2.0.8", "thiserror 2.0.8",
@ -1325,7 +1384,7 @@ dependencies = [
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -1337,9 +1396,9 @@ dependencies = [
"bytes", "bytes",
"deflate", "deflate",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-app-core", "linkerd-app-core",
"linkerd-app-inbound", "linkerd-app-inbound",
"linkerd-tracing", "linkerd-tracing",
@ -1359,9 +1418,9 @@ dependencies = [
"bytes", "bytes",
"drain", "drain",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"ipnet", "ipnet",
"linkerd-addr", "linkerd-addr",
"linkerd-conditional", "linkerd-conditional",
@ -1415,7 +1474,7 @@ dependencies = [
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -1425,7 +1484,7 @@ name = "linkerd-app-gateway"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"linkerd-app-core", "linkerd-app-core",
"linkerd-app-inbound", "linkerd-app-inbound",
"linkerd-app-outbound", "linkerd-app-outbound",
@ -1436,7 +1495,7 @@ dependencies = [
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tower-test", "tower-test",
"tracing", "tracing",
@ -1449,8 +1508,8 @@ dependencies = [
"arbitrary", "arbitrary",
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"hyper", "hyper 1.5.2",
"libfuzzer-sys", "libfuzzer-sys",
"linkerd-app-core", "linkerd-app-core",
"linkerd-app-test", "linkerd-app-test",
@ -1472,7 +1531,7 @@ dependencies = [
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -1484,10 +1543,10 @@ dependencies = [
"bytes", "bytes",
"flate2", "flate2",
"futures", "futures",
"h2", "h2 0.3.26",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"ipnet", "ipnet",
"linkerd-app", "linkerd-app",
"linkerd-app-admin", "linkerd-app-admin",
@ -1506,7 +1565,7 @@ dependencies = [
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -1520,9 +1579,9 @@ dependencies = [
"bytes", "bytes",
"futures", "futures",
"futures-util", "futures-util",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-app-core", "linkerd-app-core",
"linkerd-app-test", "linkerd-app-test",
"linkerd-distribute", "linkerd-distribute",
@ -1551,7 +1610,7 @@ dependencies = [
"tokio", "tokio",
"tokio-rustls", "tokio-rustls",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tower-test", "tower-test",
"tracing", "tracing",
@ -1562,10 +1621,10 @@ name = "linkerd-app-test"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"h2", "h2 0.3.26",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-app-core", "linkerd-app-core",
"linkerd-http-route", "linkerd-http-route",
"linkerd-identity", "linkerd-identity",
@ -1578,7 +1637,7 @@ dependencies = [
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
@ -1689,7 +1748,7 @@ name = "linkerd-http-access-log"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures-core", "futures-core",
"http 0.2.11", "http 1.2.0",
"humantime", "humantime",
"linkerd-identity", "linkerd-identity",
"linkerd-proxy-transport", "linkerd-proxy-transport",
@ -1719,7 +1778,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-error", "linkerd-error",
"linkerd-stack", "linkerd-stack",
@ -1731,7 +1790,7 @@ name = "linkerd-http-classify"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-error", "linkerd-error",
"linkerd-http-box", "linkerd-http-box",
@ -1748,7 +1807,7 @@ dependencies = [
name = "linkerd-http-executor" name = "linkerd-http-executor"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"hyper", "hyper 1.5.2",
"tokio", "tokio",
"tracing", "tracing",
] ]
@ -1762,7 +1821,7 @@ name = "linkerd-http-insert"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"linkerd-stack", "linkerd-stack",
"pin-project", "pin-project",
"tower", "tower",
@ -1774,9 +1833,9 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-error", "linkerd-error",
"linkerd-http-classify", "linkerd-http-classify",
"linkerd-metrics", "linkerd-metrics",
@ -1792,7 +1851,7 @@ dependencies = [
name = "linkerd-http-override-authority" name = "linkerd-http-override-authority"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"http 0.2.11", "http 1.2.0",
"linkerd-stack", "linkerd-stack",
"tower", "tower",
"tracing", "tracing",
@ -1804,7 +1863,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-error", "linkerd-error",
"linkerd-http-box", "linkerd-http-box",
@ -1821,7 +1880,7 @@ dependencies = [
name = "linkerd-http-retain" name = "linkerd-http-retain"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-stack", "linkerd-stack",
"pin-project", "pin-project",
@ -1834,9 +1893,9 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-error", "linkerd-error",
"linkerd-exp-backoff", "linkerd-exp-backoff",
"linkerd-http-box", "linkerd-http-box",
@ -1854,7 +1913,7 @@ dependencies = [
name = "linkerd-http-route" name = "linkerd-http-route"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"http 0.2.11", "http 1.2.0",
"linkerd2-proxy-api", "linkerd2-proxy-api",
"maplit", "maplit",
"rand", "rand",
@ -1869,7 +1928,7 @@ name = "linkerd-http-stream-timeouts"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-error", "linkerd-error",
"linkerd-stack", "linkerd-stack",
@ -1887,9 +1946,9 @@ dependencies = [
"bytes", "bytes",
"drain", "drain",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-duplex", "linkerd-duplex",
"linkerd-error", "linkerd-error",
"linkerd-http-version", "linkerd-http-version",
@ -1906,7 +1965,7 @@ dependencies = [
name = "linkerd-http-version" name = "linkerd-http-version"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"http 0.2.11", "http 1.2.0",
"thiserror 2.0.8", "thiserror 2.0.8",
] ]
@ -2033,9 +2092,9 @@ name = "linkerd-metrics"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"deflate", "deflate",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"linkerd-http-box", "linkerd-http-box",
"linkerd-stack", "linkerd-stack",
"linkerd-system", "linkerd-system",
@ -2055,7 +2114,7 @@ name = "linkerd-opencensus"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-error", "linkerd-error",
"linkerd-metrics", "linkerd-metrics",
@ -2063,7 +2122,7 @@ dependencies = [
"opencensus-proto", "opencensus-proto",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tracing", "tracing",
] ]
@ -2082,7 +2141,7 @@ dependencies = [
"opentelemetry_sdk", "opentelemetry_sdk",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tracing", "tracing",
] ]
@ -2136,7 +2195,7 @@ name = "linkerd-proxy-api-resolve"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-addr", "linkerd-addr",
"linkerd-error", "linkerd-error",
@ -2148,8 +2207,8 @@ dependencies = [
"linkerd-tonic-stream", "linkerd-tonic-stream",
"linkerd2-proxy-api", "linkerd2-proxy-api",
"pin-project", "pin-project",
"prost", "prost 0.12.6",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -2209,7 +2268,7 @@ name = "linkerd-proxy-client-policy"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"ahash", "ahash",
"http 0.2.11", "http 1.2.0",
"ipnet", "ipnet",
"linkerd-error", "linkerd-error",
"linkerd-exp-backoff", "linkerd-exp-backoff",
@ -2221,10 +2280,10 @@ dependencies = [
"linkerd2-proxy-api", "linkerd2-proxy-api",
"maplit", "maplit",
"once_cell", "once_cell",
"prost-types", "prost-types 0.12.6",
"quickcheck", "quickcheck",
"thiserror 2.0.8", "thiserror 2.0.8",
"tonic", "tonic 0.10.2",
] ]
[[package]] [[package]]
@ -2260,11 +2319,11 @@ dependencies = [
"bytes", "bytes",
"drain", "drain",
"futures", "futures",
"h2", "h2 0.3.26",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"httparse", "httparse",
"hyper", "hyper 1.5.2",
"hyper-balance", "hyper-balance",
"linkerd-detect", "linkerd-detect",
"linkerd-duplex", "linkerd-duplex",
@ -2311,7 +2370,7 @@ dependencies = [
"pin-project", "pin-project",
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tonic", "tonic 0.10.2",
"tracing", "tracing",
] ]
@ -2333,13 +2392,13 @@ name = "linkerd-proxy-server-policy"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"governor", "governor",
"http 0.2.11", "http 1.2.0",
"ipnet", "ipnet",
"linkerd-http-route", "linkerd-http-route",
"linkerd-identity", "linkerd-identity",
"linkerd2-proxy-api", "linkerd2-proxy-api",
"maplit", "maplit",
"prost-types", "prost-types 0.12.6",
"quickcheck", "quickcheck",
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
@ -2362,7 +2421,7 @@ dependencies = [
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
"x509-parser", "x509-parser",
@ -2374,9 +2433,9 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 1.5.2",
"ipnet", "ipnet",
"linkerd-conditional", "linkerd-conditional",
"linkerd-error", "linkerd-error",
@ -2388,12 +2447,12 @@ dependencies = [
"linkerd2-proxy-api", "linkerd2-proxy-api",
"parking_lot", "parking_lot",
"pin-project", "pin-project",
"prost-types", "prost-types 0.12.6",
"quickcheck", "quickcheck",
"rand", "rand",
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -2476,7 +2535,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"futures", "futures",
"http 0.2.11", "http 1.2.0",
"http-body 0.4.6", "http-body 0.4.6",
"linkerd-addr", "linkerd-addr",
"linkerd-dns-name", "linkerd-dns-name",
@ -2488,13 +2547,13 @@ dependencies = [
"linkerd-tonic-watch", "linkerd-tonic-watch",
"linkerd2-proxy-api", "linkerd2-proxy-api",
"once_cell", "once_cell",
"prost-types", "prost-types 0.12.6",
"quickcheck", "quickcheck",
"regex", "regex",
"thiserror 2.0.8", "thiserror 2.0.8",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tonic", "tonic 0.10.2",
"tower", "tower",
"tracing", "tracing",
] ]
@ -2607,7 +2666,7 @@ dependencies = [
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tracing", "tracing",
] ]
@ -2622,7 +2681,7 @@ dependencies = [
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tokio-test", "tokio-test",
"tonic", "tonic 0.10.2",
"tower-test", "tower-test",
"tracing", "tracing",
] ]
@ -2635,7 +2694,7 @@ dependencies = [
"bytes", "bytes",
"futures", "futures",
"hex", "hex",
"http 0.2.11", "http 1.2.0",
"linkerd-error", "linkerd-error",
"linkerd-stack", "linkerd-stack",
"rand", "rand",
@ -2670,7 +2729,7 @@ dependencies = [
"linkerd-error", "linkerd-error",
"linkerd-io", "linkerd-io",
"linkerd-stack", "linkerd-stack",
"prost", "prost 0.12.6",
"prost-build", "prost-build",
"tokio", "tokio",
"tokio-test", "tokio-test",
@ -2711,17 +2770,16 @@ dependencies = [
[[package]] [[package]]
name = "linkerd2-proxy-api" name = "linkerd2-proxy-api"
version = "0.15.0" version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/linkerd/linkerd2-proxy-api.git?rev=f70b2fc#f70b2fc90a1540cd69ffc6aea39093bb7dcafc67"
checksum = "a4682c00263191a5bfa4fbe64f6d80b22ff2b49aaa294da5aac062f5abc6eb9e"
dependencies = [ dependencies = [
"h2", "h2 0.4.7",
"http 0.2.11", "http 1.2.0",
"ipnet", "ipnet",
"prost", "prost 0.13.4",
"prost-types", "prost-types 0.13.4",
"quickcheck", "quickcheck",
"thiserror 1.0.69", "thiserror 2.0.8",
"tonic", "tonic 0.12.3",
] ]
[[package]] [[package]]
@ -2966,9 +3024,9 @@ name = "opencensus-proto"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"prost", "prost 0.12.6",
"prost-types", "prost-types 0.12.6",
"tonic", "tonic 0.10.2",
"tonic-build", "tonic-build",
] ]
@ -2992,8 +3050,8 @@ version = "0.1.0"
dependencies = [ dependencies = [
"opentelemetry", "opentelemetry",
"opentelemetry_sdk", "opentelemetry_sdk",
"prost", "prost 0.12.6",
"tonic", "tonic 0.10.2",
"tonic-build", "tonic-build",
] ]
@ -3132,9 +3190,9 @@ dependencies = [
"nix", "nix",
"once_cell", "once_cell",
"parking_lot", "parking_lot",
"prost", "prost 0.12.6",
"prost-build", "prost-build",
"prost-derive", "prost-derive 0.12.6",
"sha2", "sha2",
"smallvec", "smallvec",
"symbolic-demangle", "symbolic-demangle",
@ -3222,7 +3280,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
dependencies = [ dependencies = [
"bytes", "bytes",
"prost-derive", "prost-derive 0.12.6",
]
[[package]]
name = "prost"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
dependencies = [
"bytes",
"prost-derive 0.13.4",
] ]
[[package]] [[package]]
@ -3239,8 +3307,8 @@ dependencies = [
"once_cell", "once_cell",
"petgraph", "petgraph",
"prettyplease", "prettyplease",
"prost", "prost 0.12.6",
"prost-types", "prost-types 0.12.6",
"regex", "regex",
"syn", "syn",
"tempfile", "tempfile",
@ -3259,13 +3327,35 @@ dependencies = [
"syn", "syn",
] ]
[[package]]
name = "prost-derive"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
dependencies = [
"anyhow",
"itertools",
"proc-macro2",
"quote",
"syn",
]
[[package]] [[package]]
name = "prost-types" name = "prost-types"
version = "0.12.6" version = "0.12.6"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
dependencies = [ dependencies = [
"prost", "prost 0.12.6",
]
[[package]]
name = "prost-types"
version = "0.13.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cc2f1e56baa61e93533aebc21af4d2134b70f66275e0fcdf3cbe43d77ff7e8fc"
dependencies = [
"prost 0.13.4",
] ]
[[package]] [[package]]
@ -3626,9 +3716,9 @@ name = "spiffe-proto"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"bytes", "bytes",
"prost", "prost 0.12.6",
"prost-types", "prost-types 0.12.6",
"tonic", "tonic 0.10.2",
"tonic-build", "tonic-build",
] ]
@ -3960,14 +4050,14 @@ dependencies = [
"axum", "axum",
"base64 0.21.7", "base64 0.21.7",
"bytes", "bytes",
"h2", "h2 0.3.26",
"http 0.2.11", "http 0.2.11",
"http-body 0.4.6", "http-body 0.4.6",
"hyper", "hyper 0.14.31",
"hyper-timeout", "hyper-timeout",
"percent-encoding", "percent-encoding",
"pin-project", "pin-project",
"prost", "prost 0.12.6",
"tokio", "tokio",
"tokio-stream", "tokio-stream",
"tower", "tower",
@ -3976,6 +4066,27 @@ dependencies = [
"tracing", "tracing",
] ]
[[package]]
name = "tonic"
version = "0.12.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
dependencies = [
"async-trait",
"base64 0.22.0",
"bytes",
"http 1.2.0",
"http-body 1.0.1",
"http-body-util",
"percent-encoding",
"pin-project",
"prost 0.13.4",
"tokio-stream",
"tower-layer",
"tower-service",
"tracing",
]
[[package]] [[package]]
name = "tonic-build" name = "tonic-build"
version = "0.10.2" version = "0.10.2"

10
Cargo.toml
View File

@ -98,12 +98,14 @@ debug = 1
lto = true lto = true
[workspace.dependencies] [workspace.dependencies]
http = { version = "0.2" } http = { version = "1.2" }
http-body = { version = "0.4" } http-body = { version = "0.4" }
hyper = { version = "0.14", default-features = false } hyper = { version = "1.5", default-features = false }
linkerd2-proxy-api = "0.15.0"
tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] } tokio-rustls = { version = "0.26", default-features = false, features = ["ring", "logging"] }
# linkerd2-proxy-api = { git = "https://github.com/linkerd/linkerd2-proxy-api.git", branch = "main" }
[workspace.dependencies.linkerd2-proxy-api]
git = "https://github.com/linkerd/linkerd2-proxy-api.git"
rev = "f70b2fc"
# NB: hyperium/hyper#3796 backports the server connection builder's # NB: hyperium/hyper#3796 backports the server connection builder's
# `max_pending_accept_reset_streams()` method. once released, we can depend on # `max_pending_accept_reset_streams()` method. once released, we can depend on

2
hyper-balance/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated"] } hyper = { workspace = true }
pin-project = "1" pin-project = "1"
tower = { version = "0.4", default-features = false, features = ["load"] } tower = { version = "0.4", default-features = false, features = ["load"] }
tokio = { version = "1", features = ["macros"] } tokio = { version = "1", features = ["macros"] }

2
linkerd/app/admin/Cargo.toml
View File

@ -19,7 +19,7 @@ bytes = "1"
deflate = { version = "1", optional = true, features = ["gzip"] } deflate = { version = "1", optional = true, features = ["gzip"] }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
pprof = { version = "0.14", optional = true, features = ["prost-codec"] } pprof = { version = "0.14", optional = true, features = ["prost-codec"] }
serde = "1" serde = "1"

2
linkerd/app/core/Cargo.toml
View File

@ -17,7 +17,7 @@ bytes = "1"
drain = { version = "0.1", features = ["retain"] } drain = { version = "0.1", features = ["retain"] }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
ipnet = "2.10" ipnet = "2.10"
prometheus-client = "0.22" prometheus-client = "0.22"

4
linkerd/app/inbound/Cargo.toml
View File

@ -45,7 +45,7 @@ path = "../../proxy/server-policy"
features = ["proto"] features = ["proto"]
[target.'cfg(fuzzing)'.dependencies] [target.'cfg(fuzzing)'.dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" } linkerd-app-test = { path = "../test" }
arbitrary = { version = "1", features = ["derive"] } arbitrary = { version = "1", features = ["derive"] }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
@ -54,7 +54,7 @@ linkerd-meshtls-rustls = { path = "../../meshtls/rustls", features = [
] } ] }
[dev-dependencies] [dev-dependencies]
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-test = { path = "../test" } linkerd-app-test = { path = "../test" }
linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] } linkerd-http-metrics = { path = "../../http/metrics", features = ["test-util"] }
linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] } linkerd-idle-cache = { path = "../../idle-cache", features = ["test-util"] }

2
linkerd/app/inbound/fuzz/Cargo.toml
View File

@ -10,7 +10,7 @@ cargo-fuzz = true
[target.'cfg(fuzzing)'.dependencies] [target.'cfg(fuzzing)'.dependencies]
arbitrary = { version = "1", features = ["derive"] } arbitrary = { version = "1", features = ["derive"] }
hyper = { version = "0.14", features = ["deprecated", "http1", "http2"] } hyper = { version = "0.14", features = ["http1", "http2"] }
http = { workspace = true } http = { workspace = true }
libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] } libfuzzer-sys = { version = "0.4", features = ["arbitrary-derive"] }
linkerd-app-core = { path = "../../core" } linkerd-app-core = { path = "../../core" }

3
linkerd/app/integration/Cargo.toml
View File

@ -23,11 +23,8 @@ h2 = "0.3"
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = [ hyper = { workspace = true, features = [
"backports",
"deprecated",
"http1", "http1",
"http2", "http2",
"stream",
"client", "client",
"server", "server",
] } ] }

2
linkerd/app/outbound/Cargo.toml
View File

@ -54,7 +54,7 @@ linkerd-tonic-watch = { path = "../../tonic-watch" }
[dev-dependencies] [dev-dependencies]
futures-util = "0.3" futures-util = "0.3"
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
tokio = { version = "1", features = ["macros", "sync", "time"] } tokio = { version = "1", features = ["macros", "sync", "time"] }
tokio-rustls = { workspace = true } tokio-rustls = { workspace = true }
tokio-test = "0.4" tokio-test = "0.4"

2
linkerd/app/test/Cargo.toml
View File

@ -17,7 +17,7 @@ futures = { version = "0.3", default-features = false }
h2 = "0.3" h2 = "0.3"
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-app-core = { path = "../core" } linkerd-app-core = { path = "../core" }
linkerd-http-route = { path = "../../http/route", optional = true } linkerd-http-route = { path = "../../http/route", optional = true }
linkerd-identity = { path = "../../identity" } linkerd-identity = { path = "../../identity" }

2
linkerd/http/executor/Cargo.toml
View File

@ -10,6 +10,6 @@ HTTP runtime components for Linkerd.
""" """
[dependencies] [dependencies]
hyper = { workspace = true, features = ["deprecated"] } hyper = { workspace = true }
tokio = { version = "1", features = ["rt"] } tokio = { version = "1", features = ["rt"] }
tracing = "0.1" tracing = "0.1"

2
linkerd/http/metrics/Cargo.toml
View File

@ -14,7 +14,7 @@ bytes = "1"
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
parking_lot = "0.12" parking_lot = "0.12"
pin-project = "1" pin-project = "1"
tokio = { version = "1", features = ["time"] } tokio = { version = "1", features = ["time"] }

2
linkerd/http/retry/Cargo.toml
View File

@ -24,6 +24,6 @@ linkerd-metrics = { path = "../../metrics" }
linkerd-stack = { path = "../../stack" } linkerd-stack = { path = "../../stack" }
[dev-dependencies] [dev-dependencies]
hyper = { workspace = true, features = ["deprecated"] } hyper = { workspace = true }
linkerd-tracing = { path = "../../tracing", features = ["ansi"] } linkerd-tracing = { path = "../../tracing", features = ["ansi"] }
tokio = { version = "1", features = ["macros", "rt"] } tokio = { version = "1", features = ["macros", "rt"] }

2
linkerd/http/upgrade/Cargo.toml
View File

@ -15,7 +15,7 @@ drain = "0.1"
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, default-features = false, features = ["deprecated", "client"] } hyper = { workspace = true, default-features = false, features = ["client"] }
pin-project = "1" pin-project = "1"
tokio = { version = "1", default-features = false } tokio = { version = "1", default-features = false }
tower = { version = "0.4", default-features = false } tower = { version = "0.4", default-features = false }

2
linkerd/metrics/Cargo.toml
View File

@ -16,7 +16,7 @@ test_util = []
deflate = { version = "1", features = ["gzip"] } deflate = { version = "1", features = ["gzip"] }
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
linkerd-http-box = { path = "../http/box" } linkerd-http-box = { path = "../http/box" }
linkerd-stack = { path = "../stack", optional = true } linkerd-stack = { path = "../stack", optional = true }
linkerd-system = { path = "../system", optional = true } linkerd-system = { path = "../system", optional = true }

4
linkerd/proxy/http/Cargo.toml
View File

@ -21,14 +21,10 @@ http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
httparse = "1" httparse = "1"
hyper = { workspace = true, features = [ hyper = { workspace = true, features = [
"backports",
"client", "client",
"deprecated",
"http1", "http1",
"http2", "http2",
"server", "server",
"stream",
"runtime",
] } ] }
hyper-balance = { path = "../../../hyper-balance" } hyper-balance = { path = "../../../hyper-balance" }
parking_lot = "0.12" parking_lot = "0.12"

2
linkerd/proxy/tap/Cargo.toml
View File

@ -10,7 +10,7 @@ publish = false
bytes = "1" bytes = "1"
http = { workspace = true } http = { workspace = true }
http-body = { workspace = true } http-body = { workspace = true }
hyper = { workspace = true, features = ["backports", "deprecated", "http1", "http2"] } hyper = { workspace = true, features = ["http1", "http2"] }
futures = { version = "0.3", default-features = false } futures = { version = "0.3", default-features = false }
ipnet = "2.10" ipnet = "2.10"
linkerd2-proxy-api = { workspace = true, features = ["tap"] } linkerd2-proxy-api = { workspace = true, features = ["tap"] }