From 24528cf61c278fd51eedfce8eb4ea08fddb08ba4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Mon, 5 Jun 2023 11:40:39 -0700 Subject: [PATCH 1/3] agent: Update image-rs to v0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates image-rs in preparation for the CoCo v0.6.0 release. Fixes: #7036 Signed-off-by: Aurélien Bombo --- 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 646091e41e..b13e9eeb96 100644 --- a/src/agent/Cargo.lock +++ b/src/agent/Cargo.lock @@ -1849,7 +1849,7 @@ dependencies = [ [[package]] name = "image-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/image-rs?rev=22224d9#22224d9e3e795022c009150cd405b95b0f94aa83" +source = "git+https://github.com/confidential-containers/image-rs?tag=v0.6.0#62288ee4cd275c3c9d02c7f650d2cad8d8920b04" dependencies = [ "anyhow", "async-compression", @@ -2705,7 +2705,7 @@ dependencies = [ [[package]] name = "ocicrypt-rs" version = "0.1.0" -source = "git+https://github.com/confidential-containers/ocicrypt-rs.git?rev=defbacc#defbacc393ea26c78f207eceb21ce8090b6a161e" +source = "git+https://github.com/confidential-containers/ocicrypt-rs.git?tag=v0.6.0#c8d248d2a56ba4fd48263f8c442e1f9598b4c8f5" dependencies = [ "aes 0.8.2", "anyhow", diff --git a/src/agent/Cargo.toml b/src/agent/Cargo.toml index 6bf091f556..967ab4b11b 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/image-rs", rev = "22224d9", default-features = false, features = ["kata-cc-native-tls"] } +image-rs = { git = "https://github.com/confidential-containers/image-rs", tag = "v0.6.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 944d7ab2c1bea269a09e81088d1fd1d1f1d444ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Mon, 5 Jun 2023 11:47:32 -0700 Subject: [PATCH 2/3] versions: Update attestation-agent to v0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates attestation-agent in preparation for the CoCo v0.6.0 release. Signed-off-by: Aurélien Bombo --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 0d2ef13ee2..0f5b3d6062 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/attestation-agent" - version: "aa1d3c510350cd2f2668aca374abba19e2b73b3f" + version: "v0.6.0" cni-plugins: description: "CNI network plugins" From 600d55692f5250b724fd1e3499652bdbe7e55b09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20Bombo?= Date: Mon, 5 Jun 2023 11:48:53 -0700 Subject: [PATCH 3/3] versions: Update td-shim to v0.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates td-shim in preparation for the CoCo v0.6.0 release. Signed-off-by: Aurélien Bombo --- versions.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/versions.yaml b/versions.yaml index 0f5b3d6062..1996276102 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: "3252047213b2c580c21bdc52f67e8515ca1e374a" + version: "v0.6.0" toolchain: "nightly-2022-11-15" virtiofsd: