github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-06-27 15:57:09 +00:00
Code Issues Projects Releases Wiki Activity

cgroups: upgrade cgroupfs to 0.3.1

Browse Source 
Trait method cause for std::error::Error is deprecated thus need replace
it with source method for cgroups-fs::error::ErrorKind.

Fixes: #6192
Signed-off-by: Jianyong Wu <jianyong.wu@arm.com>
This commit is contained in:
Jianyong Wu 2023-02-07 17:53:23 +08:00
parent ab59a65c92
commit 5d37d31ac7
9 changed files with 29 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/agent/Cargo.lock generated
View File

@ -276,9 +276,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "cgroups-rs" name = "cgroups-rs"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",

2
src/agent/Cargo.toml
View File

@ -51,7 +51,7 @@ log = "0.4.11"
prometheus = { version = "0.13.0", features = ["process"] } prometheus = { version = "0.13.0", features = ["process"] }
procfs = "0.12.0" procfs = "0.12.0"
anyhow = "1.0.32" anyhow = "1.0.32"
cgroups = { package = "cgroups-rs", version = "0.3.0" } cgroups = { package = "cgroups-rs", version = "0.3.1" }
# Tracing # Tracing
tracing = "0.1.26" tracing = "0.1.26"

2
src/agent/rustjail/Cargo.toml
View File

@ -25,7 +25,7 @@ scan_fmt = "0.2.6"
regex = "1.5.6" regex = "1.5.6"
path-absolutize = "1.2.0" path-absolutize = "1.2.0"
anyhow = "1.0.32" anyhow = "1.0.32"
cgroups = { package = "cgroups-rs", version = "0.3.0" } cgroups = { package = "cgroups-rs", version = "0.3.1" }
rlimit = "0.5.3" rlimit = "0.5.3"
cfg-if = "0.1.0" cfg-if = "0.1.0"

23
src/libs/Cargo.lock generated
View File

@ -110,14 +110,15 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "cgroups-rs" name = "cgroups-rs"
version = "0.2.8" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b827f9d9f6c2fff719d25f5d44cbc8d2ef6df1ef00d055c5c14d5dc25529579" checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",
"nix 0.23.1", "nix 0.25.1",
"regex", "regex",
"thiserror",
] ]
[[package]] [[package]]
@ -536,9 +537,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
[[package]] [[package]]
name = "libc" name = "libc"
version = "0.2.124" version = "0.2.139"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "21a41fed9d98f27ab1c6d161da622a4fa35e8a54a8adc24bbf3ddd0ef70b0e50" checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79"
[[package]] [[package]]
name = "lock_api" name = "lock_api"
@ -640,6 +641,18 @@ dependencies = [
"memoffset", "memoffset",
] ]
[[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]] [[package]]
name = "ntapi" name = "ntapi"
version = "0.3.7" version = "0.3.7"

2
src/libs/kata-sys-util/Cargo.toml
View File

@ -12,7 +12,7 @@ edition = "2018"
[dependencies] [dependencies]
byteorder = "1.4.3" byteorder = "1.4.3"
cgroups = { package = "cgroups-rs", version = "0.3.0" } cgroups = { package = "cgroups-rs", version = "0.3.1" }
chrono = "0.4.0" chrono = "0.4.0"
common-path = "=1.0.0" common-path = "=1.0.0"
fail = "0.5.0" fail = "0.5.0"

4
src/runtime-rs/Cargo.lock generated
View File

@ -401,9 +401,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "cgroups-rs" name = "cgroups-rs"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",

2
src/runtime-rs/crates/resource/Cargo.toml
View File

@ -14,7 +14,7 @@ anyhow = "^1.0"
async-trait = "0.1.48" async-trait = "0.1.48"
bitflags = "1.2.1" bitflags = "1.2.1"
byte-unit = "4.0.14" byte-unit = "4.0.14"
cgroups-rs = "0.3.0" cgroups-rs = "0.3.1"
futures = "0.3.11" futures = "0.3.11"
lazy_static = "1.4.0" lazy_static = "1.4.0"
libc = ">=0.2.39" libc = ">=0.2.39"

4
src/tools/runk/Cargo.lock generated
View File

@ -233,9 +233,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]] [[package]]
name = "cgroups-rs" name = "cgroups-rs"
version = "0.3.0" version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4b97b639839204a6eb727ffbbd68e1dcfc55488c3a26cb0cda1d662b7a186e79" checksum = "8d5761f3a351b92e0e02a31ca418190bb323edb0d4fce0109b6dba673dc3fdc1"
dependencies = [ dependencies = [
"libc", "libc",
"log", "log",

2
src/tools/runk/libcontainer/Cargo.toml
View File

@ -20,7 +20,7 @@ chrono = { version = "0.4.19", features = ["serde"] }
serde = { version = "1.0.133", features = ["derive"] } serde = { version = "1.0.133", features = ["derive"] }
serde_json = "1.0.74" serde_json = "1.0.74"
scopeguard = "1.1.0" scopeguard = "1.1.0"
cgroups = { package = "cgroups-rs", version = "0.3.0" } cgroups = { package = "cgroups-rs", version = "0.3.1" }
procfs = "0.14.0" procfs = "0.14.0"
[dev-dependencies] [dev-dependencies]