From 65c9c4adac575755c66f4d6dc26ee63cd04354c6 Mon Sep 17 00:00:00 2001 From: Eguo Wang Date: Fri, 6 Sep 2024 21:22:48 +0800 Subject: [PATCH] build(deps): bump kube, k8s-metrics and amp-common versions --- Cargo.lock | 138 +++++++++++++++++++++++++++++++++---------- Cargo.toml | 10 ++-- resources/Cargo.toml | 2 +- 3 files changed, 114 insertions(+), 36 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 83d89ca..e4b6433 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -62,7 +62,7 @@ checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" [[package]] name = "amp-apiserver" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "amp-resources", @@ -89,7 +89,7 @@ dependencies = [ [[package]] name = "amp-builder" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "amp-resources", @@ -103,8 +103,8 @@ dependencies = [ [[package]] name = "amp-common" -version = "0.9.0" -source = "git+https://github.com/amphitheatre-app/common?tag=v0.9.0#3221376c736d1101f8aaf410bd6462aae4c207d3" +version = "0.9.1" +source = "git+https://github.com/amphitheatre-app/common?tag=v0.9.1#5340d2c2ec6f0bdba70d40af70c6cec79d6935af" dependencies = [ "anyhow", "chrono", @@ -131,7 +131,7 @@ dependencies = [ [[package]] name = "amp-controllers" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "amp-resources", @@ -153,7 +153,7 @@ dependencies = [ [[package]] name = "amp-crdgen" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "clap", @@ -165,7 +165,7 @@ dependencies = [ [[package]] name = "amp-resolver" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "amp-resources", @@ -178,7 +178,7 @@ dependencies = [ [[package]] name = "amp-resources" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "anyhow", @@ -198,7 +198,7 @@ dependencies = [ [[package]] name = "amp-syncer" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-common", "async-nats", @@ -214,7 +214,7 @@ dependencies = [ [[package]] name = "amp-workflow" -version = "0.9.0" +version = "0.9.1" dependencies = [ "amp-builder", "amp-common", @@ -339,9 +339,9 @@ dependencies = [ [[package]] name = "async-nats" -version = "0.35.1" +version = "0.36.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab8df97cb8fc4a884af29ab383e9292ea0939cfcdd7d2a17179086dc6c427e7f" +checksum = "f71e5a1bab60f46b0b005f4808b8ee83ef6d577608923de938403393c9a30cf8" dependencies = [ "base64 0.22.1", "bytes", @@ -365,6 +365,7 @@ dependencies = [ "time", "tokio", "tokio-rustls 0.26.0", + "tokio-util", "tracing", "tryhard", "url", @@ -1018,6 +1019,15 @@ dependencies = [ "miniz_oxide", ] +[[package]] +name = "fluent-uri" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17c704e9dbe1ddd863da1e6ff3567795087b1eb201ce80d8fa81162e1516500d" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "fnv" version = "1.0.7" @@ -1174,6 +1184,30 @@ dependencies = [ "allocator-api2", ] +[[package]] +name = "headers" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" +dependencies = [ + "base64 0.21.7", + "bytes", + "headers-core", + "http", + "httpdate", + "mime", + "sha1", +] + +[[package]] +name = "headers-core" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54b4a22553d4242c49fddb9ba998a99962b5cc6f22cb5a3482bec22522403ce4" +dependencies = [ + "http", +] + [[package]] name = "heck" version = "0.5.0" @@ -1236,12 +1270,12 @@ dependencies = [ [[package]] name = "http-body-util" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0475f8b2ac86659c21b64320d5d653f9efe42acd2a4e560073ec61a155a34f1d" +checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f" dependencies = [ "bytes", - "futures-core", + "futures-util", "http", "http-body", "pin-project-lite", @@ -1285,6 +1319,26 @@ dependencies = [ "want", ] +[[package]] +name = "hyper-http-proxy" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5d06dbdfbacf34d996c6fb540a71a684a7aae9056c71951163af8a8a4c07b9a4" +dependencies = [ + "bytes", + "futures-util", + "headers", + "http", + "hyper", + "hyper-rustls 0.27.1", + "hyper-util", + "pin-project-lite", + "rustls-native-certs", + "tokio", + "tokio-rustls 0.26.0", + "tower-service", +] + [[package]] name = "hyper-rustls" version = "0.26.0" @@ -1481,10 +1535,11 @@ dependencies = [ [[package]] name = "json-patch" -version = "1.4.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec9ad60d674508f3ca8f380a928cfe7b096bc729c4e2dbfe3852bc45da3ab30b" +checksum = "5b1fb8864823fad91877e6caea0baca82e49e8db50f8e5c9f9a453e27d3330fc" dependencies = [ + "jsonptr", "serde", "serde_json", "thiserror", @@ -1511,6 +1566,17 @@ dependencies = [ "thiserror", ] +[[package]] +name = "jsonptr" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1c6e529149475ca0b2820835d3dce8fcc41c6b943ca608d32f35b449255e4627" +dependencies = [ + "fluent-uri", + "serde", + "serde_json", +] + [[package]] name = "jwt" version = "0.16.0" @@ -1528,9 +1594,9 @@ dependencies = [ [[package]] name = "k8s-metrics" -version = "0.16.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed075040b76b2c7be32e40d347eed2ba3f5ca1ba88b01db8671076c7d8f55aee" +checksum = "b2d48584b6a436445fa9dadc06beecd2ccc52c57606249d5f21f183e65af7598" dependencies = [ "go-parse-duration", "k8s-openapi", @@ -1574,9 +1640,9 @@ dependencies = [ [[package]] name = "kube" -version = "0.91.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "264461a7ebf4fb0fcf23e4c7e4f9387c5696ee61d003de207d9b5a895ff37bfa" +checksum = "0365920075af1a2d23619c1ca801c492f2400157de42627f041a061716e76416" dependencies = [ "k8s-openapi", "kube-client", @@ -1587,9 +1653,9 @@ dependencies = [ [[package]] name = "kube-client" -version = "0.91.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47164ad6c47398ee4bdf90509c7b44026229721cb1377eb4623a1ec2a00a85e9" +checksum = "d81336eb3a5b10a40c97a5a97ad66622e92bad942ce05ee789edd730aa4f8603" dependencies = [ "base64 0.22.1", "bytes", @@ -1601,6 +1667,7 @@ dependencies = [ "http-body", "http-body-util", "hyper", + "hyper-http-proxy", "hyper-rustls 0.27.1", "hyper-timeout", "hyper-util", @@ -1624,9 +1691,9 @@ dependencies = [ [[package]] name = "kube-core" -version = "0.91.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797d3044a238825432129cd9537e12c2a6dacbbb5352381af5ea55e1505ed4f" +checksum = "cce373a74d787d439063cdefab0f3672860bd7bac01a38e39019177e764a0fe6" dependencies = [ "chrono", "form_urlencoded", @@ -1641,9 +1708,9 @@ dependencies = [ [[package]] name = "kube-derive" -version = "0.91.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcf837edaa0c478f85e9a3cddb17fa80d58a57c1afa722b3a9e55753ea162f41" +checksum = "04a26c9844791e127329be5dce9298b03f9e2ff5939076d5438c92dea5eb78f2" dependencies = [ "darling", "proc-macro2", @@ -1654,9 +1721,9 @@ dependencies = [ [[package]] name = "kube-runtime" -version = "0.91.0" +version = "0.93.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e463e89a1fb222c65a5469b568803153d1bf13d084a8dd42b659e6cca66edc6e" +checksum = "3b84733c0fed6085c9210b43ffb96248676c1e800d0ba38d15043275a792ffa4" dependencies = [ "ahash", "async-broadcast", @@ -1667,13 +1734,13 @@ dependencies = [ "futures", "hashbrown", "json-patch", + "jsonptr", "k8s-openapi", "kube-client", "parking_lot", "pin-project", "serde", "serde_json", - "smallvec", "thiserror", "tokio", "tokio-util", @@ -2692,6 +2759,17 @@ dependencies = [ "unsafe-libyaml", ] +[[package]] +name = "sha1" +version = "0.10.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "sha2" version = "0.10.8" diff --git a/Cargo.toml b/Cargo.toml index 5013bde..fab412c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace.package] -version = "0.9.0" +version = "0.9.1" edition = "2021" license = "Apache-2.0" repository = "https://github.com/amphitheatre-app/amphitheatre" @@ -22,18 +22,18 @@ members = [ # https://doc.rust-lang.org/cargo/reference/workspaces.html#the-workspacedependencies-table [workspace.dependencies] amp-builder = { path = "builder" } -amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.9.0" } +amp-common = { git = "https://github.com/amphitheatre-app/common", tag = "v0.9.1" } amp-resolver = { path = "resolver" } amp-resources = { path = "resources" } amp-workflow = { path = "workflow" } anyhow = "1.0.86" -async-nats = "0.35.1" +async-nats = "0.36.0" async-trait = "0.1.82" clap = { version = "4.5.16", features = ["derive", "env"] } dotenv = "0.15.0" futures = "0.3.30" -k8s-openapi = { version = "0.22.0", default-features = false, features = ["schemars", "v1_30"] } -kube = { version = "0.91.0", default-features = false, features = ["runtime", "derive", "rustls-tls"] } +k8s-openapi = { version = "0.22.0", default-features = false, features = ["schemars", "latest"] } +kube = { version = "0.93.1", default-features = false, features = ["runtime", "derive", "rustls-tls"] } lazy_static = "1.5.0" serde = { version = "1.0.209", features = ["derive"] } serde_json = "1.0.127" diff --git a/resources/Cargo.toml b/resources/Cargo.toml index 292329e..a2a9aa1 100644 --- a/resources/Cargo.toml +++ b/resources/Cargo.toml @@ -11,7 +11,7 @@ description = "K8s resources manager for the Amphitheatre platform" [dependencies] amp-common.workspace = true anyhow.workspace = true -k8s-metrics = "0.16.0" +k8s-metrics = "0.18.0" k8s-openapi.workspace = true kube.workspace = true lazy_static.workspace = true