diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index f551445703..913d342745 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -2835,7 +2835,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", diff --git a/src/libs/Cargo.lock b/src/libs/Cargo.lock index 8bf4e8e045..253ffcf94f 100644 --- a/src/libs/Cargo.lock +++ b/src/libs/Cargo.lock @@ -240,19 +240,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "cgroups-rs" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b098e7c3a70d03c288fa0a96ccf13e770eb3d78c4cc0e1549b3c13215d5f965" -dependencies = [ - "libc", - "log", - "nix 0.25.1", - "regex", - "thiserror", -] - [[package]] name = "chrono" version = "0.4.20" @@ -814,7 +801,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", @@ -975,18 +961,6 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.26.4" diff --git a/src/libs/kata-sys-util/Cargo.toml b/src/libs/kata-sys-util/Cargo.toml index 13d860ee45..079339c9cf 100644 --- a/src/libs/kata-sys-util/Cargo.toml +++ b/src/libs/kata-sys-util/Cargo.toml @@ -13,7 +13,6 @@ edition = "2018" [dependencies] anyhow = "1.0.31" byteorder = "1.4.3" -cgroups = { package = "cgroups-rs", version = "0.3.2" } chrono = "0.4.0" common-path = "=1.0.0" fail = "0.5.0" diff --git a/src/libs/kata-sys-util/README.md b/src/libs/kata-sys-util/README.md index 0c3f887bcb..14bebfef88 100644 --- a/src/libs/kata-sys-util/README.md +++ b/src/libs/kata-sys-util/README.md @@ -1,10 +1,9 @@ -# kata-sys-util +# `kata-sys-util` This crate is a collection of utilities and helpers for [Kata Containers](https://github.com/kata-containers/kata-containers/) components to access system services. It provides safe wrappers over system services, such as: -- cgroups - file systems - mount - NUMA diff --git a/src/runtime-rs/Cargo.lock b/src/runtime-rs/Cargo.lock index 10457637ae..44e409b27f 100644 --- a/src/runtime-rs/Cargo.lock +++ b/src/runtime-rs/Cargo.lock @@ -1844,7 +1844,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", diff --git a/src/tools/agent-ctl/Cargo.lock b/src/tools/agent-ctl/Cargo.lock index 7ecbd1ac05..d931c1b735 100644 --- a/src/tools/agent-ctl/Cargo.lock +++ b/src/tools/agent-ctl/Cargo.lock @@ -1186,7 +1186,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", diff --git a/src/tools/genpolicy/Cargo.lock b/src/tools/genpolicy/Cargo.lock index 7655b8d6e4..0ad4fefb5b 100644 --- a/src/tools/genpolicy/Cargo.lock +++ b/src/tools/genpolicy/Cargo.lock @@ -295,19 +295,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cgroups-rs" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" -dependencies = [ - "libc", - "log", - "nix 0.25.1", - "regex", - "thiserror", -] - [[package]] name = "chrono" version = "0.4.31" @@ -1288,7 +1275,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", @@ -1484,18 +1470,6 @@ dependencies = [ "memoffset 0.6.5", ] -[[package]] -name = "nix" -version = "0.25.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" -dependencies = [ - "autocfg", - "bitflags 1.3.2", - "cfg-if", - "libc", -] - [[package]] name = "nix" version = "0.26.4" diff --git a/src/tools/kata-ctl/Cargo.lock b/src/tools/kata-ctl/Cargo.lock index 2746bf64ea..7499a35161 100644 --- a/src/tools/kata-ctl/Cargo.lock +++ b/src/tools/kata-ctl/Cargo.lock @@ -27,7 +27,7 @@ dependencies = [ "log", "logging", "nix 0.24.3", - "oci", + "oci-spec", "protobuf 3.3.0", "protocols", "serde", @@ -329,19 +329,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" -[[package]] -name = "cgroups-rs" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db7c2f5545da4c12c5701455d9471da5f07db52e49b9cccb4f5512226dd0836" -dependencies = [ - "libc", - "log", - "nix 0.25.1", - "regex", - "thiserror", -] - [[package]] name = "chrono" version = "0.4.31" @@ -376,7 +363,7 @@ dependencies = [ "anstream", "anstyle", "clap_lex", - "strsim", + "strsim 0.10.0", ] [[package]] @@ -523,12 +510,12 @@ dependencies = [ [[package]] name = "darling" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e" +checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989" dependencies = [ - "darling_core 0.20.3", - "darling_macro 0.20.3", + "darling_core 0.20.10", + "darling_macro 0.20.10", ] [[package]] @@ -546,15 +533,15 @@ dependencies = [ [[package]] name = "darling_core" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621" +checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5" dependencies = [ "fnv", "ident_case", "proc-macro2", "quote", - "strsim", + "strsim 0.11.1", "syn 2.0.39", ] @@ -571,11 +558,11 @@ dependencies = [ [[package]] name = "darling_macro" -version = "0.20.3" +version = "0.20.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5" +checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ - "darling_core 0.20.3", + "darling_core 0.20.10", "quote", "syn 2.0.39", ] @@ -601,6 +588,37 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "derive_builder" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "507dfb09ea8b7fa618fcf76e953f4f5e192547945816d5358edffe39f6f94947" +dependencies = [ + "derive_builder_macro", +] + +[[package]] +name = "derive_builder_core" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2d5bcf7b024d6835cfb3d473887cd966994907effbe9227e8c8219824d06c4e8" +dependencies = [ + "darling 0.20.10", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "derive_builder_macro" +version = "0.20.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c" +dependencies = [ + "derive_builder_core", + "syn 2.0.39", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -832,6 +850,18 @@ dependencies = [ "wasi", ] +[[package]] +name = "getset" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f636605b743120a8d32ed92fc27b6cde1a769f8f936c065151eb66f88ded513c" +dependencies = [ + "proc-macro-error2", + "proc-macro2", + "quote", + "syn 2.0.39", +] + [[package]] name = "gimli" version = "0.28.1" @@ -893,6 +923,12 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.1.19" @@ -1167,8 +1203,8 @@ dependencies = [ "shim-interface", "slog", "slog-scope", - "strum", - "strum_macros", + "strum 0.24.1", + "strum_macros 0.24.3", "sys-info", "tempfile", "test-utils", @@ -1186,7 +1222,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail", @@ -1195,9 +1230,10 @@ dependencies = [ "lazy_static", "libc", "nix 0.24.3", - "oci", + "oci-spec", "once_cell", "rand", + "runtime-spec", "safe-path", "serde", "serde_json", @@ -1218,7 +1254,7 @@ dependencies = [ "glob", "lazy_static", "num_cpus", - "oci", + "oci-spec", "regex", "safe-path", "serde", @@ -1478,20 +1514,27 @@ dependencies = [ ] [[package]] -name = "oci" -version = "0.1.0" +name = "oci-spec" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f5a3fe998d50101ae009351fec56d88a69f4ed182e11000e711068c2f5abf72" dependencies = [ - "libc", + "derive_builder", + "getset", + "once_cell", + "regex", "serde", - "serde_derive", "serde_json", + "strum 0.26.3", + "strum_macros 0.26.4", + "thiserror", ] [[package]] name = "once_cell" -version = "1.18.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" [[package]] name = "openssl" @@ -1694,10 +1737,32 @@ dependencies = [ ] [[package]] -name = "proc-macro2" -version = "1.0.70" +name = "proc-macro-error-attr2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39278fbbf5fb4f646ce651690877f89d1c5811a3d4acb27700c1cb3cdb78fd3b" +checksum = "96de42df36bb9bba5542fe9f1a054b8cc87e172759a1868aa05c1f3acc89dfc5" +dependencies = [ + "proc-macro2", + "quote", +] + +[[package]] +name = "proc-macro-error2" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "11ec05c52be0a07b08061f7dd003e7d7092e0472bc731b4af7bb1ef876109802" +dependencies = [ + "proc-macro-error-attr2", + "proc-macro2", + "quote", + "syn 2.0.39", +] + +[[package]] +name = "proc-macro2" +version = "1.0.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a" dependencies = [ "unicode-ident", ] @@ -1879,7 +1944,8 @@ name = "protocols" version = "0.1.0" dependencies = [ "async-trait", - "oci", + "kata-sys-util", + "oci-spec", "protobuf 3.3.0", "ttrpc 0.8.1", "ttrpc-codegen", @@ -1917,9 +1983,9 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.33" +version = "1.0.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af" dependencies = [ "proc-macro2", ] @@ -2011,9 +2077,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.2" +version = "1.10.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", @@ -2023,9 +2089,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.3" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2145,6 +2211,16 @@ dependencies = [ "serde_derive", ] +[[package]] +name = "runtime-spec" +version = "0.1.0" +dependencies = [ + "libc", + "serde", + "serde_derive", + "serde_json", +] + [[package]] name = "rust_decimal" version = "1.35.0" @@ -2399,7 +2475,7 @@ version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "881b6f881b17d13214e5d494c939ebab463d01264ce1811e9d4ac3a882e7695f" dependencies = [ - "darling 0.20.3", + "darling 0.20.10", "proc-macro2", "quote", "syn 2.0.39", @@ -2569,12 +2645,24 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + [[package]] name = "strum" version = "0.24.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f" +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + [[package]] name = "strum_macros" version = "0.24.3" @@ -2588,6 +2676,19 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck 0.5.0", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.39", +] + [[package]] name = "subprocess" version = "0.2.9" diff --git a/src/tools/runk/Cargo.lock b/src/tools/runk/Cargo.lock index e1afc6f91c..b842273083 100644 --- a/src/tools/runk/Cargo.lock +++ b/src/tools/runk/Cargo.lock @@ -1391,7 +1391,6 @@ version = "0.1.0" dependencies = [ "anyhow", "byteorder", - "cgroups-rs", "chrono", "common-path", "fail",