diff --git a/Cargo.lock b/Cargo.lock index 4183c28e3..e355527a3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -177,16 +177,13 @@ dependencies = [ ] [[package]] -name = "backoff" -version = "0.4.0" +name = "backon" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62ddb9cb1ec0a098ad4bbf9344d0713fa193ae1a80af55febcff2627b6a00c1" +checksum = "970d91570c01a8a5959b36ad7dd1c30642df24b6b3068710066f6809f7033bb7" dependencies = [ - "futures-core", - "getrandom 0.2.15", - "instant", - "pin-project-lite", - "rand 0.8.5", + "fastrand", + "gloo-timers", "tokio", ] @@ -440,9 +437,9 @@ dependencies = [ [[package]] name = "drain" -version = "0.1.2" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d105028bd2b5dfcb33318fd79a445001ead36004dd8dffef1bdd7e493d8bc1e" +checksum = "599214ee8a1d13a3a422a016834d5cf71ff984a38ea463f30677e62348161b7f" dependencies = [ "tokio", ] @@ -534,6 +531,12 @@ dependencies = [ "pin-project-lite", ] +[[package]] +name = "fastrand" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" + [[package]] name = "fnv" version = "1.0.7" @@ -649,9 +652,9 @@ dependencies = [ [[package]] name = "gateway-api" -version = "0.14.2" +version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdca285b86710063162382f6d688fb67918fa8a231cb9248c817f53ddcb53491" +checksum = "0ea401eaa9802293115029b448ef0f13ebc39cccfd9651aa2abac084aa4f4bef" dependencies = [ "delegate", "k8s-openapi", @@ -703,6 +706,18 @@ version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" +[[package]] +name = "gloo-timers" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994" +dependencies = [ + "futures-channel", + "futures-core", + "js-sys", + "wasm-bindgen", +] + [[package]] name = "h2" version = "0.4.8" @@ -1007,15 +1022,6 @@ dependencies = [ "hashbrown 0.14.5", ] -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - [[package]] name = "ipnet" version = "2.11.0" @@ -1072,9 +1078,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "3.0.1" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +checksum = "159294d661a039f7644cea7e4d844e6b25aaf71c1ffe9d73a96d768c24b0faf4" dependencies = [ "jsonptr", "serde", @@ -1097,9 +1103,9 @@ dependencies = [ [[package]] name = "jsonptr" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe" dependencies = [ "serde", "serde_json", @@ -1121,9 +1127,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.98.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32053dc495efad4d188c7b33cc7c02ef4a6e43038115348348876efd39a53cba" +checksum = "9a4eb20010536b48abe97fec37d23d43069bcbe9686adcf9932202327bc5ca6e" dependencies = [ "k8s-openapi", "kube-client", @@ -1134,9 +1140,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.98.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d34ad38cdfbd1fa87195d42569f57bb1dda6ba5f260ee32fef9570b7937a0c9" +checksum = "7fc2ed952042df20d15ac2fe9614d0ec14b6118eab89633985d4b36e688dccf1" dependencies = [ "base64 0.22.1", "bytes", @@ -1158,9 +1164,7 @@ dependencies = [ "kube-core", "openssl", "pem", - "rand 0.8.5", "rustls", - "rustls-pemfile", "secrecy", "serde", "serde_json", @@ -1176,9 +1180,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.98.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97aa830b288a178a90e784d1b0f1539f2d200d2188c7b4a3146d9dc983d596f3" +checksum = "ff0d0793db58e70ca6d689489183816cb3aa481673e7433dc618cf7e8007c675" dependencies = [ "chrono", "form_urlencoded", @@ -1194,34 +1198,34 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.98.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37745d8a4076b77e0b1952e94e358726866c8e14ec94baaca677d47dcdb98658" +checksum = "c562f58dc9f7ca5feac8a6ee5850ca221edd6f04ce0dd2ee873202a88cd494c9" dependencies = [ "darling", "proc-macro2", "quote", + "serde", "serde_json", "syn", ] [[package]] name = "kube-runtime" -version = "0.98.0" +version = "0.99.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a41af186a0fe80c71a13a13994abdc3ebff80859ca6a4b8a6079948328c135b" +checksum = "88f34cfab9b4bd8633062e0e85edb81df23cb09f159f2e31c60b069ae826ffdc" dependencies = [ "ahash", "async-broadcast", "async-stream", "async-trait", - "backoff", + "backon", "educe", "futures", "hashbrown 0.15.2", "hostname", "json-patch", - "jsonptr", "k8s-openapi", "kube-client", "parking_lot", @@ -1236,12 +1240,12 @@ dependencies = [ [[package]] name = "kubert" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f936f5739b42d148cc6f17fb568090cf812e77a29fef38c3cfe1a6e6390b087" +checksum = "a92cbeb0adfdf2706c4f85f0d63e01b6535d44e150f5963289cd4b8bc0115fe5" dependencies = [ "ahash", - "backoff", + "backon", "bytes", "chrono", "clap", diff --git a/Cargo.toml b/Cargo.toml index 25c7fbcea..eb720222b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,12 +15,12 @@ members = [ lto = "thin" [workspace.dependencies] -gateway-api = "0.14" +gateway-api = "0.15" http = "1" hyper = "1" -k8s-openapi = { version = "0.24", features = ["v1_31"] } -kube = { version = "0.98", default-features = false } -kubert = { version = "0.23", default-features = false } +k8s-openapi = { version = "0.24", features = ["v1_32"] } +kube = { version = "0.99", default-features = false } +kubert = { version = "0.24", default-features = false } prometheus-client = { version = "0.23", default-features = false } tonic = { version = "0.12", default-features = false } tower = { version = "0.5", default-features = false } diff --git a/deny.toml b/deny.toml index 6866c74b6..e83b95110 100644 --- a/deny.toml +++ b/deny.toml @@ -9,10 +9,6 @@ targets = [ db-path = "~/.cargo/advisory-db" db-urls = ["https://github.com/rustsec/advisory-db"] ignore = [ - # instant is unmaintained, but pulled in via kube - "RUSTSEC-2024-0384", - # backoff is unmaintained, but pulled in via kube - "RUSTSEC-2025-0012", ] [licenses] diff --git a/policy-controller/grpc/Cargo.toml b/policy-controller/grpc/Cargo.toml index 277fcacee..74904e31d 100644 --- a/policy-controller/grpc/Cargo.toml +++ b/policy-controller/grpc/Cargo.toml @@ -9,7 +9,7 @@ publish = false async-stream = "0.3" async-trait = "0.1" http = { workspace = true } -drain = "0.1" +drain = "0.2" futures = { version = "0.3", default-features = false } hyper = { workspace = true, features = ["http2", "server"] } linkerd-policy-controller-core = { path = "../core" } diff --git a/policy-controller/runtime/Cargo.toml b/policy-controller/runtime/Cargo.toml index 1f165c075..fdeede564 100644 --- a/policy-controller/runtime/Cargo.toml +++ b/policy-controller/runtime/Cargo.toml @@ -17,7 +17,7 @@ rustls-tls = ["kube/rustls-tls", "kubert/rustls-tls"] anyhow = "1" async-trait = "0.1" bytes = "1" -drain = "0.1" +drain = "0.2" futures = { version = "0.3", default-features = false } k8s-openapi = { workspace = true } http-body-util = "0.1"