From c02b6713bcb45470b6e7054d4c35b826ee8d304d Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Thu, 20 Jul 2023 15:49:35 -0500 Subject: [PATCH 1/3] agent: update image-rs to v0.7.0 v0.7.0 of image-rs has been tagged. Update to it. Fixes: #7400 Signed-off-by: Tobin Feldman-Fitzthum --- src/agent/Cargo.lock | 4 ++-- src/agent/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/agent/Cargo.lock b/src/agent/Cargo.lock index 056af2dfc3..c984fbf473 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1836,7 +1836,7 @@ dependencies = [ [[package]] name = "image-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components?rev=88dcc14#88dcc147ba8ddf34e8425c98d5931df8a995f04a" +source = "git+https://github.com/confidential-containers/guest-components?tag=v0.7.0#88dcc147ba8ddf34e8425c98d5931df8a995f04a" dependencies = [ "anyhow", "async-compression", @@ -2693,7 +2693,7 @@ dependencies = [ [[package]] name = "ocicrypt-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/guest-components?rev=88dcc14#88dcc147ba8ddf34e8425c98d5931df8a995f04a" +source = "git+https://github.com/confidential-containers/guest-components?tag=v0.7.0#88dcc147ba8ddf34e8425c98d5931df8a995f04a" dependencies = [ "aes 0.8.2", "anyhow", diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 249bb942db..358412a855 100644 --- a/src/agent/Cargo.toml +++ b/src/agent/Cargo.toml @@ -71,7 +71,7 @@ clap = { version = "3.0.1", features = ["derive"] } openssl = { version = "0.10.38", features = ["vendored"] } # Image pull/decrypt -image-rs = { git = "https://github.com/confidential-containers/guest-components", rev = "88dcc14", default-features = false, features = ["kata-cc-native-tls"] } +image-rs = { git = "https://github.com/confidential-containers/guest-components", tag = "v0.7.0", default-features = false, features = ["kata-cc-native-tls"] } [patch.crates-io] oci-distribution = { git = "https://github.com/krustlet/oci-distribution.git", rev = "f44124c" } From e41306abad8c027831817bf56dade917b2a1bb36 Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Thu, 20 Jul 2023 15:53:54 -0500 Subject: [PATCH 2/3] versions: update attestation-agent to v0.7.0 v0.7.0 of guest-components has been released, so let's use the new tag for the attestation-agent Fixes: #7400 Signed-off-by: Tobin Feldman-Fitzthum --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index f4d5d9f86e..7a5c9a87f8 100644 --- a/versions.yaml +++ b/versions.yaml @@ -194,7 +194,7 @@ externals: attestation-agent: description: "Provide attested key unwrapping for image decryption" url: "https://github.com/confidential-containers/guest-components/" - version: "88dcc147ba8ddf34e8425c98d5931df8a995f04a" + version: "v0.7.0" cni-plugins: description: "CNI network plugins" From e61974d81fcf3ec9bfc4bae6bfd04b44f89d4e93 Mon Sep 17 00:00:00 2001 From: Tobin Feldman-Fitzthum Date: Thu, 20 Jul 2023 15:55:06 -0500 Subject: [PATCH 3/3] versions: update td-shim to v0.7.0 v0.7.0 of td-shim has been released. Let's update to it. Fixes: #7400 Signed-off-by: Tobin Feldman-Fitzthum --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 7a5c9a87f8..4958fc18c2 100644 --- a/versions.yaml +++ b/versions.yaml @@ -311,7 +311,7 @@ externals: td-shim: description: "Confidential Containers Shim Firmware" url: "https://github.com/confidential-containers/td-shim" - version: "4ecf76ab8bc57c2e857937487d1923961c2b6769" + version: "v0.7.0" toolchain: "nightly-2022-11-15" virtiofsd: