From c362257142222246ffbe4c3a1ea3de2ef3843c8a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Wed, 24 Aug 2022 21:13:40 +0200 Subject: [PATCH] kata-deploy-cc: Add CLH 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 CLH TDX workloads. Fixes: #4833 Depends-on: github.com/kata-containers/tests#5070 Signed-off-by: Fabiano Fidêncio --- tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh index f6391e8ad..27f139dff 100755 --- a/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy-cc/scripts/kata-deploy.sh @@ -15,6 +15,7 @@ shims=( "qemu" "qemu-tdx" "clh" + "clh-tdx" ) default_shim="qemu" @@ -189,6 +190,7 @@ function remove_artifacts() { /opt/confidential-containers/share/kata-qemu/ \ /opt/confidential-containers/share/kata-qemu-tdx/ \ /opt/confidential-containers/share/kata-containers/ \ + /opt/confidential-containers/share/td-shim/ \ /opt/confidential-containers/share/tdvf/ \ /opt/confidential-containers/bin/kata-monitor \ /opt/confidential-containers/bin/containerd-shim-kata-v2 \