From 3508f3a43add52ccb6c3fd7e483744beaaf79600 Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Fri, 5 Apr 2024 20:40:28 -0300 Subject: [PATCH] tests/k8s: use CoCo image on guest-pull when non-TEE When running on non-TEE environments (e.g. KATA_HYPERVISOR=qemu) the tests should be stressing the CoCo image (/opt/kata/share/kata-containers/kata-containers-confidential.img) although currently the default image/initrd is built to be able to do guest-pull as well. Signed-off-by: Wainer dos Santos Moschetta --- .../kubernetes/k8s-guest-pull-image.bats | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tests/integration/kubernetes/k8s-guest-pull-image.bats b/tests/integration/kubernetes/k8s-guest-pull-image.bats index 4a9a133ad6..35d412c567 100644 --- a/tests/integration/kubernetes/k8s-guest-pull-image.bats +++ b/tests/integration/kubernetes/k8s-guest-pull-image.bats @@ -47,6 +47,11 @@ setup() { "io.containerd.cri.runtime-handler" \ "kata-${KATA_HYPERVISOR}" + [[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \ + set_metadata_annotation "$kata_pod_with_nydus_config" \ + "io.katacontainers.config.hypervisor.image" \ + "/opt/kata/share/kata-containers/kata-containers-confidential.img" + # For debug sake echo "Pod $kata_pod_with_nydus_config file:" cat $kata_pod_with_nydus_config @@ -112,6 +117,11 @@ setup() { "io.containerd.cri.runtime-handler" \ "kata-${KATA_HYPERVISOR}" + [[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \ + set_metadata_annotation "$kata_pod_with_nydus_config" \ + "io.katacontainers.config.hypervisor.image" \ + "/opt/kata/share/kata-containers/kata-containers-confidential.img" + # For debug sake echo "Pod $kata_pod_with_nydus_config file:" cat $kata_pod_with_nydus_config @@ -190,6 +200,11 @@ setup() { "io.containerd.cri.runtime-handler" \ "kata-${KATA_HYPERVISOR}" + [[ " ${SUPPORTED_NON_TEE_HYPERVISORS} " =~ " ${KATA_HYPERVISOR} " ]] && \ + set_metadata_annotation "$kata_pod_with_nydus_config" \ + "io.katacontainers.config.hypervisor.image" \ + "/opt/kata/share/kata-containers/kata-containers-confidential.img" + # For debug sake echo "Pod $kata_pod_with_nydus_config file:" cat $kata_pod_with_nydus_config