Merge pull request #7287 from Xynnn007/dep-guest-components

CCv0 | Update guest components dependency version
This commit is contained in:
Steve Horsman 2023-07-12 16:51:54 +01:00 committed by GitHub
commit 109980b24f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 37 deletions

38
src/agent/Cargo.lock generated
View File

@ -1389,19 +1389,6 @@ dependencies = [
"miniz_oxide", "miniz_oxide",
] ]
[[package]]
name = "flume"
version = "0.10.14"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1657b4441c3403d9f7b3409e47575237dac27b1b5726df654a6ecbf92f0f7577"
dependencies = [
"futures-core",
"futures-sink",
"nanorand",
"pin-project",
"spin 0.9.8",
]
[[package]] [[package]]
name = "fnv" name = "fnv"
version = "1.0.7" version = "1.0.7"
@ -1849,7 +1836,7 @@ dependencies = [
[[package]] [[package]]
name = "image-rs" name = "image-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=af35c064#af35c0649bab2d000b5c350bc5e60db67ef9e1a5" source = "git+https://github.com/confidential-containers/guest-components?rev=43f6832#43f68320ed78cef438c838c10a6f462c06bad83f"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"async-compression", "async-compression",
@ -1857,7 +1844,6 @@ dependencies = [
"base64 0.13.1", "base64 0.13.1",
"cfg-if 1.0.0", "cfg-if 1.0.0",
"flate2", "flate2",
"flume",
"futures", "futures",
"futures-util", "futures-util",
"hex", "hex",
@ -2198,7 +2184,7 @@ version = "1.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
dependencies = [ dependencies = [
"spin 0.5.2", "spin",
] ]
[[package]] [[package]]
@ -2390,15 +2376,6 @@ version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a" checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
[[package]]
name = "nanorand"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
dependencies = [
"getrandom 0.2.9",
]
[[package]] [[package]]
name = "native-tls" name = "native-tls"
version = "0.2.11" version = "0.2.11"
@ -2716,7 +2693,7 @@ dependencies = [
[[package]] [[package]]
name = "ocicrypt-rs" name = "ocicrypt-rs"
version = "0.1.0" version = "0.1.0"
source = "git+https://github.com/confidential-containers/guest-components?rev=af35c064#af35c0649bab2d000b5c350bc5e60db67ef9e1a5" source = "git+https://github.com/confidential-containers/guest-components?rev=43f6832#43f68320ed78cef438c838c10a6f462c06bad83f"
dependencies = [ dependencies = [
"aes 0.8.2", "aes 0.8.2",
"anyhow", "anyhow",
@ -4437,15 +4414,6 @@ version = "0.5.2"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
[[package]]
name = "spin"
version = "0.9.8"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
dependencies = [
"lock_api",
]
[[package]] [[package]]
name = "spki" name = "spki"
version = "0.3.0" version = "0.3.0"

View File

@ -71,7 +71,7 @@ clap = { version = "3.0.1", features = ["derive"] }
openssl = { version = "0.10.38", features = ["vendored"] } openssl = { version = "0.10.38", features = ["vendored"] }
# Image pull/decrypt # Image pull/decrypt
image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "af35c064", default-features = false, features = ["kata-cc-native-tls"] } image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "43f6832", default-features = false, features = ["kata-cc-native-tls"] }
[patch.crates-io] [patch.crates-io]
oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" } oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" }

View File

@ -194,7 +194,7 @@ externals:
attestation-agent: attestation-agent:
description: "Provide attested key unwrapping for image decryption" description: "Provide attested key unwrapping for image decryption"
url: "https://github.com/confidential-containers/guest-components/" url: "https://github.com/confidential-containers/guest-components/"
version: "af35c0649bab2d000b5c350bc5e60db67ef9e1a5" version: "43f68320ed78cef438c838c10a6f462c06bad83f"
cni-plugins: cni-plugins:
description: "CNI network plugins" description: "CNI network plugins"