From 0b34a8a18671e04fb090ab1d67a2ce856e96f68b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Fri, 5 Aug 2022 16:38:06 +0200 Subject: [PATCH] kata-deploy-cc: Add QEMU support to be used with TDX MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As the previous commit added a new runtime class to be used with TDX, let's make sure this gets shipped and configured as part of the kata-deploy-cc script, which is used by the Confidential Containers Operator. This commit also cleans up all the extra artefacts that will be installed in order to run the QEMU TDX workloads. Fixes: #4832 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index fac806f0cb..f6391e8ade 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -13,6 +13,7 @@ containerd_conf_file_backup="${containerd_conf_file}.bak" shims=( "qemu" + "qemu-tdx" "clh" ) @@ -186,12 +187,15 @@ function remove_artifacts() { /opt/confidential-containers/share/defaults/kata-containers/ \ /opt/confidential-containers/share/bash-completion/completions/kata-runtime \ /opt/confidential-containers/share/kata-qemu/ \ + /opt/confidential-containers/share/kata-qemu-tdx/ \ /opt/confidential-containers/share/kata-containers/ \ + /opt/confidential-containers/share/tdvf/ \ /opt/confidential-containers/bin/kata-monitor \ /opt/confidential-containers/bin/containerd-shim-kata-v2 \ /opt/confidential-containers/bin/kata-runtime \ /opt/confidential-containers/bin/kata-collect-data.sh \ /opt/confidential-containers/bin/qemu-system-x86_64 \ + /opt/confidential-containers/bin/qemu-system-x86_64-tdx \ /opt/confidential-containers/bin/cloud-hypervisor }