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

Merge pull request #10236 from fidencio/topic/bump-image-rs-to-properly-handle-gzip-whiteouts

Browse Source 
agent: Update image-rs to 02af65abc
This commit is contained in:
Fabiano Fidêncio 2024-09-02 21:43:19 +02:00 committed by GitHub
commit e1d3fb8c00
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 68 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

146
src/agent/Cargo.lock generated
View File

@ -175,9 +175,9 @@ dependencies = [
[[package]]
name = "async-compression"
version = "0.4.11"
version = "0.4.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd066d0b4ef8ecb03a55319dc13aa6910616d0f44008a045bb1835af830abff5"
checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
dependencies = [
"flate2",
"futures-core",
@ -185,8 +185,8 @@ dependencies = [
"memchr",
"pin-project-lite",
"tokio",
"zstd 0.13.2",
"zstd-safe 7.2.0",
"zstd",
"zstd-safe",
]
[[package]]
@ -398,11 +398,11 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
[[package]]
name = "attester"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"anyhow",
"async-trait",
"base64 0.21.7",
"base64 0.22.1",
"hex",
"kbs-types",
"log",
@ -410,7 +410,7 @@ dependencies = [
"serde_json",
"serde_with",
"sha2",
"strum 0.25.0",
"strum",
"thiserror",
]
@ -1157,11 +1157,11 @@ checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7"
[[package]]
name = "crypto"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"aes-gcm",
"anyhow",
"base64 0.21.7",
"base64 0.22.1",
"ctr",
"kbs-types",
"rand",
@ -1169,7 +1169,7 @@ dependencies = [
"serde",
"serde_json",
"sha2",
"strum 0.25.0",
"strum",
"zeroize",
]
@ -2463,12 +2463,12 @@ dependencies = [
[[package]]
name = "image-rs"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"anyhow",
"async-compression",
"async-trait",
"base64 0.21.7",
"base64 0.22.1",
"cfg-if 1.0.0",
"filetime",
"flate2",
@ -2481,7 +2481,7 @@ dependencies = [
"log",
"loopdev",
"nix 0.28.0",
"oci-distribution",
"oci-client",
"oci-spec",
"ocicrypt-rs",
"protobuf 3.5.0",
@ -2492,15 +2492,16 @@ dependencies = [
"serde_yaml",
"sha2",
"sigstore",
"strum 0.25.0",
"strum_macros 0.26.4",
"strum",
"strum_macros",
"tokio",
"tokio-util 0.7.11",
"ttrpc",
"ttrpc-codegen",
"url",
"walkdir",
"zstd 0.12.4",
"xattr 1.3.1",
"zstd",
]
[[package]]
@ -2817,8 +2818,8 @@ dependencies = [
"slog-scope",
"slog-stdlog",
"slog-term",
"strum 0.26.3",
"strum_macros 0.26.4",
"strum",
"strum_macros",
"tempfile",
"test-utils",
"thiserror",
@ -2889,27 +2890,27 @@ dependencies = [
[[package]]
name = "kbc"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"anyhow",
"async-trait",
"base64 0.21.7",
"base64 0.22.1",
"crypto",
"kbs_protocol",
"log",
"resource_uri",
"serde",
"serde_json",
"strum 0.25.0",
"strum",
"url",
"zeroize",
]
[[package]]
name = "kbs-types"
version = "0.6.0"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "febd73b2b1df274ea454d81ddf76f596af9754410b7ed6f988f2e1782a175da3"
checksum = "9b6441ed73b0faa50707d4de41c6b45c76654b661b96aaf7b26a41331eedc0a5"
dependencies = [
"serde",
"serde_json",
@ -2918,12 +2919,12 @@ dependencies = [
[[package]]
name = "kbs_protocol"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"anyhow",
"async-trait",
"attester",
"base64 0.21.7",
"base64 0.22.1",
"crypto",
"jwt-simple",
"kbs-types",
@ -3291,13 +3292,14 @@ dependencies = [
[[package]]
name = "mio"
version = "0.8.11"
version = "1.0.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
dependencies = [
"hermit-abi 0.3.9",
"libc",
"wasi",
"windows-sys 0.48.0",
"windows-sys 0.52.0",
]
[[package]]
@ -3627,6 +3629,31 @@ dependencies = [
"memchr",
]
[[package]]
name = "oci-client"
version = "0.12.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0f5098b86f972ac3484f7c9011bbbbd64aaa7e21d10d2c1a91fefb4ad0ba2ad9"
dependencies = [
"bytes 1.6.1",
"chrono",
"futures-util",
"http",
"http-auth",
"jwt",
"lazy_static",
"olpc-cjson",
"regex",
"reqwest",
"serde",
"serde_json",
"sha2",
"thiserror",
"tokio",
"tracing",
"unicase",
]
[[package]]
name = "oci-distribution"
version = "0.11.0"
@ -3664,20 +3691,20 @@ dependencies = [
"regex",
"serde",
"serde_json",
"strum 0.26.3",
"strum_macros 0.26.4",
"strum",
"strum_macros",
"thiserror",
]
[[package]]
name = "ocicrypt-rs"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"aes",
"anyhow",
"async-trait",
"base64 0.21.7",
"base64 0.22.1",
"base64-serde",
"cfg-if 1.0.0",
"ctr",
@ -4677,7 +4704,7 @@ dependencies = [
[[package]]
name = "resource_uri"
version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=51e967045296570abb4ad8bef215e92323306ed4#51e967045296570abb4ad8bef215e92323306ed4"
source = "git+https://github.com/confidential-containers/guest-components?rev=02af65abc984f91eb97ac7a6b7ff3acce9746334#02af65abc984f91eb97ac7a6b7ff3acce9746334"
dependencies = [
"anyhow",
"serde",
@ -5592,32 +5619,13 @@ version = "0.11.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
[[package]]
name = "strum"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
dependencies = [
"strum_macros 0.25.3",
]
[[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.25.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
dependencies = [
"heck 0.4.1",
"proc-macro2",
"quote",
"rustversion",
"syn 2.0.71",
"strum_macros",
]
[[package]]
@ -5903,28 +5911,27 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.38.0"
version = "1.40.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
dependencies = [
"backtrace",
"bytes 1.6.1",
"libc",
"mio",
"num_cpus",
"parking_lot 0.12.3",
"pin-project-lite",
"signal-hook-registry",
"socket2 0.5.7",
"tokio-macros",
"windows-sys 0.48.0",
"windows-sys 0.52.0",
]
[[package]]
name = "tokio-macros"
version = "2.3.0"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
@ -7076,32 +7083,13 @@ dependencies = [
"syn 2.0.71",
]
[[package]]
name = "zstd"
version = "0.12.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a27595e173641171fc74a1232b7b1c7a7cb6e18222c11e9dfb9888fa424c53c"
dependencies = [
"zstd-safe 6.0.6",
]
[[package]]
name = "zstd"
version = "0.13.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fcf2b778a664581e31e389454a7072dab1647606d44f7feea22cd5abb9c9f3f9"
dependencies = [
"zstd-safe 7.2.0",
]
[[package]]
name = "zstd-safe"
version = "6.0.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ee98ffd0b48ee95e6c5168188e44a54550b1564d9d530ee21d5f0eaed1069581"
dependencies = [
"libc",
"zstd-sys",
"zstd-safe",
]
[[package]]

2
src/agent/Cargo.toml
View File

@ -77,7 +77,7 @@ strum = "0.26.2"
strum_macros = "0.26.2"
# Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "70f570eb50f1791ff3b2a5e941b662a7bd3c46bd", default-features = false, optional = true }
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "02af65abc984f91eb97ac7a6b7ff3acce9746334", default-features = false, optional = true }
# Agent Policy
regorus = { version = "0.1.4", default-features = false, features = [