diff --git a/Cargo.lock b/Cargo.lock index 61b4ab0e..1959b14b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -447,6 +447,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" +[[package]] +name = "foldhash" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" + [[package]] name = "form_urlencoded" version = "1.2.2" @@ -603,7 +609,7 @@ checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.1.5", ] [[package]] @@ -611,6 +617,11 @@ name = "hashbrown" version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +dependencies = [ + "allocator-api2", + "equivalent", + "foldhash 0.2.0", +] [[package]] name = "headers" @@ -847,6 +858,30 @@ version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" +[[package]] +name = "jiff" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1a3546dc96b6d42c5f24902af9e2538e82e39ad350b0c766eb3fbf2d8f3d8359" +dependencies = [ + "jiff-static", + "log", + "portable-atomic", + "portable-atomic-util", + "serde_core", +] + +[[package]] +name = "jiff-static" +version = "0.2.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8c8b344124222efd714b73bb41f8b5120b27a7cc1c75593a6ff768d9d05aa4" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "jobserver" version = "0.1.34" @@ -892,6 +927,19 @@ dependencies = [ "thiserror 2.0.17", ] +[[package]] +name = "jsonpath-rust" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633a7320c4bb672863a3782e89b9094ad70285e097ff6832cddd0ec615beadfa" +dependencies = [ + "pest", + "pest_derive", + "regex", + "serde_json", + "thiserror 2.0.17", +] + [[package]] name = "jsonptr" version = "0.7.1" @@ -914,16 +962,28 @@ dependencies = [ "serde_json", ] +[[package]] +name = "k8s-openapi" +version = "0.27.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51b326f5219dd55872a72c1b6ddd1b830b8334996c667449c29391d657d78d5e" +dependencies = [ + "base64", + "jiff", + "serde", + "serde_json", +] + [[package]] name = "kube" -version = "1.1.0" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "778f98664beaf4c3c11372721e14310d1ae00f5e2d9aabcf8906c881aa4e9f51" +checksum = "acc5a6a69da2975ed9925d56b5dcfc9cc739b66f37add06785b7c9f6d1e88741" dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", - "kube-runtime", + "k8s-openapi 0.27.1", + "kube-client 3.1.0", + "kube-core 3.1.0", + "kube-runtime 3.1.0", ] [[package]] @@ -946,9 +1006,44 @@ dependencies = [ "hyper-rustls", "hyper-timeout", "hyper-util", - "jsonpath-rust", - "k8s-openapi", - "kube-core", + "jsonpath-rust 0.7.5", + "k8s-openapi 0.25.0", + "kube-core 1.1.0", + "pem", + "rustls", + "secrecy", + "serde", + "serde_json", + "serde_yaml", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tracing", +] + +[[package]] +name = "kube-client" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fcaf2d1f1a91e1805d4cd82e8333c022767ae8ffd65909bbef6802733a7dd40" +dependencies = [ + "base64", + "bytes", + "either", + "futures", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-timeout", + "hyper-util", + "jiff", + "jsonpath-rust 1.0.4", + "k8s-openapi 0.27.1", + "kube-core 3.1.0", "pem", "rustls", "secrecy", @@ -974,7 +1069,25 @@ dependencies = [ "form_urlencoded", "http", "json-patch", - "k8s-openapi", + "k8s-openapi 0.25.0", + "serde", + "serde-value", + "serde_json", + "thiserror 2.0.17", +] + +[[package]] +name = "kube-core" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f126d2db7a8b532ec1d839ece2a71e2485dc3bbca6cc3c3f929becaa810e719e" +dependencies = [ + "derive_more", + "form_urlencoded", + "http", + "jiff", + "json-patch", + "k8s-openapi 0.27.1", "serde", "serde-value", "serde_json", @@ -996,8 +1109,35 @@ dependencies = [ "hashbrown 0.15.5", "hostname", "json-patch", - "k8s-openapi", - "kube-client", + "k8s-openapi 0.25.0", + "kube-client 1.1.0", + "parking_lot", + "pin-project", + "serde", + "serde_json", + "thiserror 2.0.17", + "tokio", + "tokio-util", + "tracing", +] + +[[package]] +name = "kube-runtime" +version = "3.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c072737075826ee74d3e615e80334e41e617ca3d14fb46ef7cdfda822d6f15f2" +dependencies = [ + "ahash", + "async-broadcast", + "async-stream", + "backon", + "educe", + "futures", + "hashbrown 0.16.1", + "hostname", + "json-patch", + "k8s-openapi 0.27.1", + "kube-client 3.1.0", "parking_lot", "pin-project", "serde", @@ -1023,9 +1163,9 @@ dependencies = [ "http-body-util", "hyper", "hyper-util", - "kube-client", - "kube-core", - "kube-runtime", + "kube-client 1.1.0", + "kube-core 1.1.0", + "kube-runtime 1.1.0", "kubert-prometheus-process", "kubert-prometheus-tokio", "pin-project-lite", @@ -1085,7 +1225,7 @@ dependencies = [ "chrono", "clap", "futures", - "k8s-openapi", + "k8s-openapi 0.25.0", "kube", "kubert", "prometheus-client", @@ -1310,6 +1450,21 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" +[[package]] +name = "portable-atomic" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" + +[[package]] +name = "portable-atomic-util" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +dependencies = [ + "portable-atomic", +] + [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1950,6 +2105,7 @@ dependencies = [ "http-body", "mime", "pin-project-lite", + "tower", "tower-layer", "tower-service", "tracing", diff --git a/cni-repair-controller/Cargo.toml b/cni-repair-controller/Cargo.toml index 4c1d9728..35b0fedc 100644 --- a/cni-repair-controller/Cargo.toml +++ b/cni-repair-controller/Cargo.toml @@ -10,7 +10,7 @@ publish = false anyhow = "1" futures = "0.3" k8s-openapi = { version = "0.25", features = ["v1_33"] } -kube = { version = "1.1", default-features = false, features = ["runtime", "rustls-tls"] } +kube = { version = "3.1", default-features = false, features = ["runtime", "rustls-tls"] } prometheus-client = { version = "0.23", default-features = false } rustls = { version = "0.23", default-features = false, features = ["aws-lc-rs"] } tracing = "0.1"