From 7b7a20861024b2de756dceffe3193f150cfdc03b Mon Sep 17 00:00:00 2001 From: Tianhao Geng Date: Wed, 3 May 2023 19:40:34 +0000 Subject: [PATCH] package update bump k8s-openapi and kube to latest version --- Cargo.lock | 159 ++++++++++++++++++++++----------------- agent/Cargo.toml | 4 +- agent/src/main.rs | 23 +++--- apiserver/Cargo.toml | 4 +- apiserver/src/api/mod.rs | 10 ++- clarify.toml | 7 ++ controller/Cargo.toml | 4 +- controller/src/main.rs | 12 ++- deny.toml | 7 ++ integ/Cargo.toml | 4 +- models/Cargo.toml | 4 +- yamlgen/Cargo.toml | 2 +- 12 files changed, 143 insertions(+), 97 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a7c640c..78726186 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -135,7 +135,7 @@ dependencies = [ "http", "log", "pin-project-lite", - "tokio-rustls", + "tokio-rustls 0.23.4", "tokio-util", "webpki-roots", ] @@ -334,7 +334,7 @@ dependencies = [ "opentelemetry", "opentelemetry-prometheus", "reqwest", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "schemars", "serde", @@ -701,7 +701,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.2", "lazy_static", "pin-project-lite", "tokio", @@ -1630,10 +1630,25 @@ dependencies = [ "http", "hyper", "log", - "rustls", + "rustls 0.20.8", "rustls-native-certs", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", +] + +[[package]] +name = "hyper-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0646026eb1b3eea4cd9ba47912ea5ce9cc07713d105b1a14698f4e6433d348b7" +dependencies = [ + "http", + "hyper", + "log", + "rustls 0.21.1", + "rustls-native-certs", + "tokio", + "tokio-rustls 0.24.0", ] [[package]] @@ -1820,9 +1835,9 @@ dependencies = [ [[package]] name = "json-patch" -version = "0.3.0" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e712e62827c382a77b87f590532febb1f8b2fdbc3eefa1ee37fe7281687075ef" +checksum = "1f54898088ccb91df1b492cc80029a6fdf1c48ca0db7c6822a8babad69c94658" dependencies = [ "serde", "serde_json", @@ -1843,11 +1858,11 @@ dependencies = [ [[package]] name = "k8s-openapi" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d1985030683a2bac402cbda61222195de80d3f66b4c87ab56e5fea379bd98c3" +checksum = "cd990069640f9db34b3b0f7a1afc62a05ffaa3be9b66aa3c313f58346df7f788" dependencies = [ - "base64 0.20.0", + "base64 0.21.0", "bytes", "chrono", "serde", @@ -1857,9 +1872,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.79.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1e74b6c3633982788dc51a02a356113b4b74e0db48929b2c7447cb57919b8ae" +checksum = "dc7d3d52dd5c871991679102e80dfb192faaaa09fecdbccdd8c55af264ce7a8f" dependencies = [ "k8s-openapi", "kube-client", @@ -1870,9 +1885,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.79.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e9065963ad9966fea4a977efaf1eb22381b56ef4882ef19155869649669dfc" +checksum = "544339f1665488243f79080441cacb09c997746fd763342303e66eebb9d3ba13" dependencies = [ "base64 0.20.0", "bytes", @@ -1883,19 +1898,19 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.24.0", "hyper-timeout", "jsonpath_lib", "k8s-openapi", "kube-core", "pem", "pin-project", - "rustls", + "rustls 0.21.1", "rustls-pemfile", "secrecy", "serde", "serde_json", - "serde_yaml 0.8.26", + "serde_yaml", "thiserror", "tokio", "tokio-util", @@ -1906,9 +1921,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.79.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "381a6982f9f48aec74022ae3e7012f990e2d9893bdafc9d4fb2c58521899440d" +checksum = "25983d07f414dfffba08c5951fe110f649113416b1d8e22f7c89c750eb2555a7" dependencies = [ "chrono", "form_urlencoded", @@ -1924,9 +1939,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.79.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e300a7410efc929a817fefe80ad0b2b16987cc236eb7737f7686b5d9bffd818" +checksum = "5af652b642aca19ef5194de3506aa39f89d788d5326a570da68b13a02d6c5ba2" dependencies = [ "darling", "proc-macro2", @@ -1937,9 +1952,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.79.0" +version = "0.82.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a11c9e91acd9115b92a7d6cf7210a50b1fdf6d341a146fb0e7eb3423d1548d4" +checksum = "125331201e3073707ac79c294c89021faa76c84da3a566a3749a2a93d295c98a" dependencies = [ "ahash 0.8.3", "async-trait", @@ -1987,12 +2002,6 @@ dependencies = [ "cc", ] -[[package]] -name = "linked-hash-map" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" - [[package]] name = "linux-raw-sys" version = "0.1.4" @@ -2576,7 +2585,7 @@ dependencies = [ "http", "http-body", "hyper", - "hyper-rustls", + "hyper-rustls 0.23.2", "ipnet", "js-sys", "log", @@ -2584,13 +2593,13 @@ dependencies = [ "once_cell", "percent-encoding", "pin-project-lite", - "rustls", + "rustls 0.20.8", "rustls-pemfile", "serde", "serde_json", "serde_urlencoded", "tokio", - "tokio-rustls", + "tokio-rustls 0.23.4", "tower-service", "url", "wasm-bindgen", @@ -2650,6 +2659,18 @@ dependencies = [ "webpki", ] +[[package]] +name = "rustls" +version = "0.21.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c911ba11bc8433e811ce56fde130ccf32f5127cab0e0194e9c68c5a5b671791e" +dependencies = [ + "log", + "ring", + "rustls-webpki", + "sct", +] + [[package]] name = "rustls-native-certs" version = "0.6.2" @@ -2671,6 +2692,16 @@ dependencies = [ "base64 0.21.0", ] +[[package]] +name = "rustls-webpki" +version = "0.100.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" +dependencies = [ + "ring", + "untrusted", +] + [[package]] name = "rustversion" version = "1.0.11" @@ -2782,9 +2813,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771d4d9c4163ee138805e12c710dd365e4f44be8be0503cb1bb9eb989425d9c9" +checksum = "bb2f3770c8bce3bcda7e149193a069a0f4365bda1fa5cd88e03bca26afc1216c" dependencies = [ "serde_derive", ] @@ -2801,9 +2832,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.158" +version = "1.0.160" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" +checksum = "291a097c63d8497e00160b166a967a4a79c64f3facdd01cbd7502231688d77df" dependencies = [ "proc-macro2", "quote", @@ -2823,9 +2854,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.94" +version = "1.0.96" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c533a59c9d8a93a09c6ab31f0fd5e5f4dd1b8fc9434804029839884765d04ea" +checksum = "057d394a50403bcac12672b2b18fb387ab6d289d957dab67dd201875391e52f1" dependencies = [ "indexmap", "itoa", @@ -2854,18 +2885,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_yaml" -version = "0.8.26" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" -dependencies = [ - "indexmap", - "ryu", - "serde", - "yaml-rust", -] - [[package]] name = "serde_yaml" version = "0.9.21" @@ -3084,22 +3103,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a9cd18aa97d5c45c6603caea1da6628790b37f7a34b6ca89522331c5180fed0" +checksum = "978c9a314bd8dc99be594bc3c175faaa9794be04a5a5e153caba6915336cebac" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fb327af4685e4d03fa8cbcf1716380da910eeb2bb8be417e7f9fd3fb164f36f" +checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 1.0.107", + "syn 2.0.4", ] [[package]] @@ -3211,11 +3230,21 @@ version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c43ee83903113e03984cb9e5cebe6c04a5116269e900e3ddba8f068a62adda59" dependencies = [ - "rustls", + "rustls 0.20.8", "tokio", "webpki", ] +[[package]] +name = "tokio-rustls" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0d409377ff5b1e3ca6437aa86c1eb7d40c134bfec254e44c830defa92669db5" +dependencies = [ + "rustls 0.21.1", + "tokio", +] + [[package]] name = "tokio-stream" version = "0.1.11" @@ -3261,11 +3290,11 @@ dependencies = [ [[package]] name = "tower-http" -version = "0.3.5" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858" +checksum = "5d1d42a9b3f3ec46ba828e8d376aec14592ea199f70a06a548587ecd1c4ab658" dependencies = [ - "base64 0.13.1", + "base64 0.20.0", "bitflags", "bytes", "futures-core", @@ -3273,6 +3302,7 @@ dependencies = [ "http", "http-body", "http-range-header", + "mime", "pin-project-lite", "tower-layer", "tower-service", @@ -3756,15 +3786,6 @@ version = "0.13.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" -[[package]] -name = "yaml-rust" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85" -dependencies = [ - "linked-hash-map", -] - [[package]] name = "yamlgen" version = "0.1.0" @@ -3772,7 +3793,7 @@ dependencies = [ "dotenv", "kube", "models", - "serde_yaml 0.9.21", + "serde_yaml", ] [[package]] diff --git a/agent/Cargo.toml b/agent/Cargo.toml index ce22de90..efa89415 100644 --- a/agent/Cargo.toml +++ b/agent/Cargo.toml @@ -17,8 +17,8 @@ tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] } tracing-opentelemetry = "0.18" # k8s-openapi must match the version required by kube and enable a k8s version feature -k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_20"] } -kube = { version = "0.79.0", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] } +k8s-openapi = { version = "0.18", default-features = false, features = ["v1_24"] } +kube = { version = "0.82", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] } semver = { version = "1.0", features = [ "serde" ] } serde = { version = "1", features = [ "derive" ] } diff --git a/agent/src/main.rs b/agent/src/main.rs index db50459d..6d2ff53b 100644 --- a/agent/src/main.rs +++ b/agent/src/main.rs @@ -2,11 +2,14 @@ use agent::agentclient::BrupopAgent; use apiserver::client::K8SAPIServerClient; use futures::StreamExt; use k8s_openapi::api::core::v1::Node; -use kube::api::ListParams; -use kube::runtime::reflector; -use kube::runtime::watcher::watcher; -use kube::runtime::WatchStreamExt; -use kube::Api; +use kube::{ + api::Api, + runtime::{ + reflector, + watcher::{watcher, Config}, + WatchStreamExt, + }, +}; use models::agent::{AGENT_TOKEN_PATH, TOKEN_PROJECTION_MOUNT_PATH}; use models::constants::NAMESPACE; @@ -60,11 +63,11 @@ async fn run_agent() -> Result<()> { // Generate reflector to watch and cache BottlerocketShadow let brss = Api::::namespaced(k8s_client.clone(), NAMESPACE); - let brs_lp = ListParams::default() + let brs_config = Config::default() .fields(format!("metadata.name={}", associated_bottlerocketshadow_name).as_str()); let brs_store = reflector::store::Writer::::default(); let brs_reader = brs_store.as_reader(); - let brs_reflector = reflector::reflector(brs_store, watcher(brss, brs_lp)); + let brs_reflector = reflector::reflector(brs_store, watcher(brss, brs_config)); let brs_drainer = brs_reflector .touched_objects() .filter_map(|x| async move { std::result::Result::ok(x) }) @@ -74,12 +77,12 @@ async fn run_agent() -> Result<()> { }); // Generate reflector to watch and cache Nodes - let node_lp = - ListParams::default().fields(format!("metadata.name={}", associated_node_name).as_str()); + let node_config = + Config::default().fields(format!("metadata.name={}", associated_node_name).as_str()); let nodes: Api = Api::all(k8s_client.clone()); let nodes_store = reflector::store::Writer::::default(); let node_reader = nodes_store.as_reader(); - let node_reflector = reflector::reflector(nodes_store, watcher(nodes, node_lp)); + let node_reflector = reflector::reflector(nodes_store, watcher(nodes, node_config)); let node_drainer = node_reflector .touched_objects() .filter_map(|x| async move { std::result::Result::ok(x) }) diff --git a/apiserver/Cargo.toml b/apiserver/Cargo.toml index 601d00d5..3515865a 100644 --- a/apiserver/Cargo.toml +++ b/apiserver/Cargo.toml @@ -29,8 +29,8 @@ tracing-subscriber = { version = "0.3", features = ["registry", "env-filter"] } tracing-opentelemetry = "0.18" # k8s-openapi must match the version required by kube and enable a k8s version feature -k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_20"] } -kube = { version = "0.79.0", default-features = false, features = [ "client", "derive", "runtime", "rustls-tls" ] } +k8s-openapi = { version = "0.18", default-features = false, features = ["v1_24"] } +kube = { version = "0.82", default-features = false, features = [ "client", "derive", "runtime", "rustls-tls" ] } async-trait = "0.1" futures = "0.3" diff --git a/apiserver/src/api/mod.rs b/apiserver/src/api/mod.rs index aabab182..e375d9c9 100644 --- a/apiserver/src/api/mod.rs +++ b/apiserver/src/api/mod.rs @@ -30,8 +30,12 @@ use actix_web_opentelemetry::{PrometheusMetricsHandler, RequestMetricsBuilder, R use futures::StreamExt; use k8s_openapi::api::core::v1::Pod; use kube::{ - api::{Api, ListParams}, - runtime::{reflector, watcher::watcher, WatchStreamExt}, + api::Api, + runtime::{ + reflector, + watcher::{watcher, Config}, + WatchStreamExt, + }, ResourceExt, }; use opentelemetry::global::meter; @@ -125,7 +129,7 @@ pub async fn run_server( pod_store, watcher( pods, - ListParams::default().labels(&format!("{}={}", LABEL_COMPONENT, AGENT)), + Config::default().labels(&format!("{}={}", LABEL_COMPONENT, AGENT)), ), ); let drainer = pod_reflector.touched_objects() diff --git a/clarify.toml b/clarify.toml index 7b79547e..0f2db257 100644 --- a/clarify.toml +++ b/clarify.toml @@ -101,3 +101,10 @@ license-files = [ { path = "LICENSE-MIT", hash = 0x386ca1bc }, { path = "LICENSE.md", hash = 0xfe66d806 }, ] + +[clarify.rustls-webpki] +expression = "ISC" +license-files = [ + { path = "LICENSE", hash = 0x001c7e6c }, + { path = "third-party/chromium/LICENSE", hash = 0x9b209a1a }, +] diff --git a/controller/Cargo.toml b/controller/Cargo.toml index b9b8babd..f9bdaf7b 100644 --- a/controller/Cargo.toml +++ b/controller/Cargo.toml @@ -16,8 +16,8 @@ maplit = "1.0" regex = "1.1" semver = "1.0" # k8s-openapi must match the version required by kube and enable a k8s version feature -k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_20"] } -kube = { version = "0.79.0", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] } +k8s-openapi = { version = "0.18", default-features = false, features = ["v1_24"] } +kube = { version = "0.82", default-features = false, features = [ "derive", "runtime", "rustls-tls" ] } models = { path = "../models", version = "0.1.0" } opentelemetry = { version = "0.18", features = ["rt-tokio-current-thread"] } opentelemetry-prometheus = "0.11" diff --git a/controller/src/main.rs b/controller/src/main.rs index 3ac25f3a..2dfc8748 100644 --- a/controller/src/main.rs +++ b/controller/src/main.rs @@ -11,8 +11,12 @@ use actix_web::{web::Data, App, HttpServer}; use futures::StreamExt; use k8s_openapi::api::core::v1::Node; use kube::{ - api::{Api, ListParams}, - runtime::{reflector, watcher::watcher, WatchStreamExt}, + api::Api, + runtime::{ + reflector, + watcher::{watcher, Config}, + WatchStreamExt, + }, ResourceExt, }; @@ -60,7 +64,7 @@ async fn main() -> Result<()> { let exporter = opentelemetry_prometheus::exporter(controller).init(); // Setup and run a reflector, ensuring that `BottlerocketShadow` updates are reflected to the controller. - let brs_reflector = reflector::reflector(brs_store, watcher(brss, ListParams::default())); + let brs_reflector = reflector::reflector(brs_store, watcher(brss, Config::default())); let brs_drainer = brs_reflector .touched_objects() .filter_map(|x| async move { std::result::Result::ok(x) }) @@ -76,7 +80,7 @@ async fn main() -> Result<()> { let nodes: Api = Api::all(k8s_client.clone()); let nodes_store = reflector::store::Writer::::default(); let node_reader = nodes_store.as_reader(); - let node_reflector = reflector::reflector(nodes_store, watcher(nodes, ListParams::default())); + let node_reflector = reflector::reflector(nodes_store, watcher(nodes, Config::default())); let node_drainer = node_reflector .touched_objects() .filter_map(|x| async move { std::result::Result::ok(x) }) diff --git a/deny.toml b/deny.toml index 4fe50c26..076a0577 100644 --- a/deny.toml +++ b/deny.toml @@ -64,3 +64,10 @@ expression = "ISC" license-files = [ { path = "LICENSE", hash = 0x001c7e6c } ] + +[[licenses.clarify]] +name = "rustls-webpki" +expression = "ISC" +license-files = [ + { path = "LICENSE", hash = 0x001c7e6c }, +] diff --git a/integ/Cargo.toml b/integ/Cargo.toml index c68a73f5..501b73bf 100644 --- a/integ/Cargo.toml +++ b/integ/Cargo.toml @@ -34,8 +34,8 @@ tokio-retry = "0.3" uuid = { version = "0.8", default-features = false, features = ["serde", "v4"] } # k8s-openapi must match the version required by kube and enable a k8s version feature -k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_20"] } -kube = { version = "0.79", default-features = false, features = [ "derive", "runtime" ] } +k8s-openapi = { version = "0.18", default-features = false, features = ["v1_24"] } +kube = { version = "0.82", default-features = false, features = [ "derive", "runtime" ] } [dev-dependencies] diff --git a/models/Cargo.toml b/models/Cargo.toml index 89d1f330..e77671ad 100644 --- a/models/Cargo.toml +++ b/models/Cargo.toml @@ -10,8 +10,8 @@ async-trait = "0.1" chrono = { version = "0.4", default-features = false, features = ["std"] } futures = "0.3" # k8s-openapi must match the version required by kube and enable a k8s version feature -k8s-openapi = { version = "0.17.0", default-features = false, features = ["v1_20"] } -kube = { version = "0.79.0", default-features = false, features = [ "client", "derive", "runtime" ] } +k8s-openapi = { version = "0.18", default-features = false, features = ["v1_24"] } +kube = { version = "0.82", default-features = false, features = [ "client", "derive", "runtime" ] } lazy_static = "1.4" maplit = "1.0" diff --git a/yamlgen/Cargo.toml b/yamlgen/Cargo.toml index 002fd37e..4b2a8ab3 100644 --- a/yamlgen/Cargo.toml +++ b/yamlgen/Cargo.toml @@ -8,5 +8,5 @@ license = "Apache-2.0 OR MIT" [build-dependencies] models = { path = "../models", version = "0.1.0" } dotenv = "0.15" -kube = { version = "0.79.0", default-features = false, features = [ "derive", "runtime" ] } +kube = { version = "0.82", default-features = false, features = [ "derive", "runtime" ] } serde_yaml = "0.9"