diff --git a/Cargo.lock b/Cargo.lock index 5a1305e9..4a3a8ff4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -54,6 +54,17 @@ dependencies = [ "libc", ] +[[package]] +name = "annotate-snippets" +version = "0.12.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c86cd1c51b95d71dde52bca69ed225008f6ff4c8cc825b08042aa1ef823e1980" +dependencies = [ + "anstyle", + "memchr", + "unicode-width 0.2.2", +] + [[package]] name = "anstream" version = "1.0.0" @@ -129,6 +140,12 @@ version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457" +[[package]] +name = "arraydeque" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d902e3d592a523def97af8f317b08ce16b7ab854c1985a0c671e6f15cebc236" + [[package]] name = "async-broadcast" version = "0.7.2" @@ -189,8 +206,8 @@ dependencies = [ "axum-server", "clap", "env_logger", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "log", "serde", "serde_json", @@ -550,8 +567,8 @@ dependencies = [ "anyhow", "clap", "compute-pcrs-lib", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "serde_json", "tokio", "trusted-cluster-operator-lib", @@ -1026,6 +1043,15 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "encoding_rs_io" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1cc3c5651fb62ab8aa3103998dade57efdd028544bd300516baa31840c252a83" +dependencies = [ + "encoding_rs", +] + [[package]] name = "enum-ordinalize" version = "4.3.2" @@ -1307,9 +1333,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", + "js-sys", "libc", "r-efi", "wasip2", + "wasm-bindgen", ] [[package]] @@ -1381,6 +1409,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "granit-parser" +version = "0.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f50ba32164f9e098d5da618776a32afbb32270adcbe3d3d006107dae11e37c91" +dependencies = [ + "arraydeque", + "smallvec", +] + [[package]] name = "group" version = "0.13.0" @@ -2093,6 +2131,18 @@ name = "k8s-openapi" version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51b326f5219dd55872a72c1b6ddd1b830b8334996c667449c29391d657d78d5e" +dependencies = [ + "base64 0.22.1", + "jiff", + "serde", + "serde_json", +] + +[[package]] +name = "k8s-openapi" +version = "0.28.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c6922f6afe80418dd6019818af5d0d34584c371780ff09b9752370c25b4abb" dependencies = [ "base64 0.22.1", "jiff", @@ -2112,8 +2162,8 @@ dependencies = [ "clap_complete", "env_logger", "heck", - "k8s-openapi", - "kube", + "k8s-openapi 0.27.1", + "kube 3.1.0", "libc", "log", "quote", @@ -2133,10 +2183,22 @@ version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acc5a6a69da2975ed9925d56b5dcfc9cc739b66f37add06785b7c9f6d1e88741" dependencies = [ - "k8s-openapi", - "kube-client", - "kube-core", - "kube-derive", + "k8s-openapi 0.27.1", + "kube-client 3.1.0", + "kube-core 3.1.0", + "kube-derive 3.1.0", +] + +[[package]] +name = "kube" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb9108095346a7096d11feeaff419c75dddcac1b2f59acb38d7bf3d13c3e146" +dependencies = [ + "k8s-openapi 0.28.0", + "kube-client 4.0.0", + "kube-core 4.0.0", + "kube-derive 4.0.0", "kube-runtime", ] @@ -2154,15 +2216,13 @@ dependencies = [ "http-body 1.0.1", "http-body-util", "hyper 1.8.1", - "hyper-openssl", "hyper-rustls 0.27.7", "hyper-timeout", "hyper-util", "jiff", "jsonpath-rust", - "k8s-openapi", - "kube-core", - "openssl", + "k8s-openapi 0.27.1", + "kube-core 3.1.0", "pem", "rustls 0.23.36", "secrecy", @@ -2177,18 +2237,71 @@ dependencies = [ "tracing", ] +[[package]] +name = "kube-client" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0f628e05bc2264c21fe10d3d675117dc9b43ea3bf4fb07262a222679757537b" +dependencies = [ + "base64 0.22.1", + "bytes", + "either", + "futures", + "http 1.4.2", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-openssl", + "hyper-timeout", + "hyper-util", + "jiff", + "jsonpath-rust", + "k8s-openapi 0.28.0", + "kube-core 4.0.0", + "openssl", + "pem", + "secrecy", + "serde", + "serde-saphyr", + "serde_json", + "thiserror 2.0.18", + "tokio", + "tokio-util", + "tower", + "tower-http", + "tracing", +] + [[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 1.4.2", + "jiff", + "k8s-openapi 0.27.1", + "schemars", + "serde", + "serde-value", + "serde_json", + "thiserror 2.0.18", +] + +[[package]] +name = "kube-core" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1b02f5933ba06140d58c7d6727f6c319f0962ec6a344aa5e21e475e891deaa8" dependencies = [ "derive_more", "form_urlencoded", "http 1.4.2", "jiff", "json-patch", - "k8s-openapi", + "k8s-openapi 0.28.0", "schemars", "serde", "serde-value", @@ -2210,11 +2323,25 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "kube-derive" +version = "4.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fe171898707dadf1818ef94e81ef57f6beb7edf9ba87b9e814c045dad356c7aa" +dependencies = [ + "darling 0.23.0", + "proc-macro2", + "quote", + "serde", + "serde_json", + "syn 2.0.117", +] + [[package]] name = "kube-runtime" -version = "3.1.0" +version = "4.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c072737075826ee74d3e615e80334e41e617ca3d14fb46ef7cdfda822d6f15f2" +checksum = "99ddec66c540c7cf29a5b41fe4a657a53687f95c346e03bdf00585b70a1bab21" dependencies = [ "ahash", "async-broadcast", @@ -2225,8 +2352,8 @@ dependencies = [ "hashbrown 0.16.0", "hostname", "json-patch", - "k8s-openapi", - "kube-client", + "k8s-openapi 0.28.0", + "kube-client 4.0.0", "parking_lot", "pin-project", "serde", @@ -2351,9 +2478,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.32" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "953f07c43838f8e6f9758cab68bf5bed85465e7587ebe0b823f1bcd81978ad3a" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] name = "matchit" @@ -2385,7 +2512,7 @@ dependencies = [ "terminal_size", "textwrap", "thiserror 1.0.69", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -2452,6 +2579,12 @@ dependencies = [ "tempfile", ] +[[package]] +name = "nohash-hasher" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bf50223579dc7cdcfb3bfcacf7069ff68243f8c363f62ffa99cf000a6b9c451" + [[package]] name = "num-bigint" version = "0.4.6" @@ -2620,9 +2753,9 @@ checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "openssl" -version = "0.10.80" +version = "0.10.81" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" +checksum = "77823a27f0babb03091cb9ed9ef80af3b39dbc82f97e8fa530374b7dafd87a45" dependencies = [ "bitflags 2.10.0", "cfg-if", @@ -2657,9 +2790,9 @@ checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] name = "openssl-sys" -version = "0.9.116" +version = "0.9.117" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" +checksum = "b47e7e6bb2c38cd930d25a23b40fa52e068c10e85f3e03a7f5ba5aaca5713695" dependencies = [ "cc", "libc", @@ -2682,8 +2815,8 @@ dependencies = [ "http 1.4.2", "json-patch", "jsonptr", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "log", "oci-client", "oci-spec 0.10.0", @@ -3134,8 +3267,8 @@ dependencies = [ "env_logger", "http 1.4.2", "ignition-config", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "log", "serde", "serde_json", @@ -3513,6 +3646,25 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "serde-saphyr" +version = "0.0.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5897b4c3faadadd35fdb6689f015641f3bc481d5adaaac56231ea15aeb243db3" +dependencies = [ + "ahash", + "annotate-snippets", + "base64 0.22.1", + "encoding_rs_io", + "getrandom 0.3.4", + "granit-parser", + "nohash-hasher", + "num-traits", + "serde", + "smallvec", + "zmij", +] + [[package]] name = "serde-value" version = "0.7.0" @@ -3956,7 +4108,7 @@ checksum = "b7b3e525a49ec206798b40326a44121291b530c963cfb01018f63e135bac543d" dependencies = [ "smawk", "unicode-linebreak", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -4253,10 +4405,10 @@ version = "0.2.1" dependencies = [ "anyhow", "compute-pcrs-lib", - "http 1.4.1", - "k8s-openapi", + "http 1.4.2", + "k8s-openapi 0.28.0", "kopium", - "kube", + "kube 4.0.0", "serde", "serde_json", "tokio", @@ -4278,8 +4430,8 @@ dependencies = [ "glob", "http 1.4.2", "ignition-config", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "log", "percent-encoding", "rand_core", @@ -4301,8 +4453,8 @@ dependencies = [ "anyhow", "cfg-if", "compute-pcrs-lib", - "k8s-openapi", - "kube", + "k8s-openapi 0.28.0", + "kube 4.0.0", "regex", "serde_json", "tokio", @@ -4382,6 +4534,12 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.2.6" @@ -4605,9 +4763,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1" [[package]] name = "which" -version = "8.0.3" +version = "8.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c789537cf2f7f55be8e6192f92e464174ee55f91af622777f7f1ceb0dbccd03e" +checksum = "48d7cd18d4acb58fb3cdfe9ea54e6cd96a4e7d4cc45c56338b236e82dad47248" dependencies = [ "libc", ] diff --git a/Cargo.toml b/Cargo.toml index 5acddabf..0acfe0dc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,8 +23,8 @@ env_logger = { version = "0.11.10", default-features = false } http = "1.4.2" ignition-config = "0.6.1" # Tracking k8s version for CI: docker.io/kindest/node:v1.35.7 -k8s-openapi = { version = "0.27.1", features = ["v1_35", "schemars"] } -kube = { version = "3.1.0", default-features = false, features = ["derive", "runtime", "openssl-tls"] } +k8s-openapi = { version = "0.28.0", features = ["v1_35", "schemars"] } +kube = { version = "4.0.0", default-features = false, features = ["derive", "runtime", "openssl-tls"] } log = "0.4.32" serde = { version = "1.0.228", features = ["derive"] } serde_json = "1.0.150"