diff --git a/src/runtime/Makefile b/src/runtime/Makefile index 5bea978828..4c14fbc788 100644 --- a/src/runtime/Makefile +++ b/src/runtime/Makefile @@ -247,8 +247,8 @@ DEFSHAREDFS_QEMU_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_COCO_DEV_VIRTIOFS := virtio-9p DEFSHAREDFS_STRATOVIRT_VIRTIOFS := virtio-fs DEFSHAREDFS_QEMU_TDX_VIRTIOFS := none -DEFSHAREDFS_QEMU_SEV_VIRTIOFS := virtio-9p -DEFSHAREDFS_QEMU_SNP_VIRTIOFS := virtio-9p +DEFSHAREDFS_QEMU_SEV_VIRTIOFS := none +DEFSHAREDFS_QEMU_SNP_VIRTIOFS := none DEFVIRTIOFSDAEMON := $(LIBEXECDIR)/virtiofsd DEFVALIDVIRTIOFSDAEMONPATHS := [\"$(DEFVIRTIOFSDAEMON)\"] # Default DAX mapping cache size in MiB diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index cf91777337..a989b899b4 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -444,7 +444,7 @@ function cleanup() { fi # Switch back to the default namespace and delete the tests one - delete_test_cluster_namespace + delete_test_cluster_namespace || true cleanup_kata_deploy } diff --git a/tests/integration/kubernetes/k8s-kill-all-process-in-container.bats b/tests/integration/kubernetes/k8s-kill-all-process-in-container.bats index ab60a5897a..794a4aa449 100644 --- a/tests/integration/kubernetes/k8s-kill-all-process-in-container.bats +++ b/tests/integration/kubernetes/k8s-kill-all-process-in-container.bats @@ -9,7 +9,8 @@ load "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { - [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" ]] && \ + [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" || \ + "${KATA_HYPERVISOR}" = "qemu-sev" || "${KATA_HYPERVISOR}" = "qemu-snp" ]] && \ skip "See: https://github.com/kata-containers/kata-containers/issues/9664" pod_name="busybox" @@ -42,7 +43,8 @@ setup() { } teardown() { - [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" ]] && \ + [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" || \ + "${KATA_HYPERVISOR}" = "qemu-sev" || "${KATA_HYPERVISOR}" = "qemu-snp" ]] && \ skip "See: https://github.com/kata-containers/kata-containers/issues/9664" # Debugging information diff --git a/tests/integration/kubernetes/k8s-shared-volume.bats b/tests/integration/kubernetes/k8s-shared-volume.bats index 63d8a1a9c8..f81eaf8449 100644 --- a/tests/integration/kubernetes/k8s-shared-volume.bats +++ b/tests/integration/kubernetes/k8s-shared-volume.bats @@ -42,7 +42,8 @@ setup() { } @test "initContainer with shared volume" { - [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" ]] && \ + [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" || \ + "${KATA_HYPERVISOR}" = "qemu-sev" || "${KATA_HYPERVISOR}" = "qemu-snp" ]] && \ skip "See: https://github.com/kata-containers/kata-containers/issues/9668" pod_name="initcontainer-shared-volume" diff --git a/tests/integration/kubernetes/k8s-sysctls.bats b/tests/integration/kubernetes/k8s-sysctls.bats index ab2eca1e9b..8987792e8d 100644 --- a/tests/integration/kubernetes/k8s-sysctls.bats +++ b/tests/integration/kubernetes/k8s-sysctls.bats @@ -9,7 +9,8 @@ load "${BATS_TEST_DIRNAME}/../../common.bash" load "${BATS_TEST_DIRNAME}/tests_common.sh" setup() { - [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" ]] && \ + [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" || \ + "${KATA_HYPERVISOR}" = "qemu-sev" || "${KATA_HYPERVISOR}" = "qemu-snp" ]] && \ skip "See: https://github.com/kata-containers/kata-containers/issues/9666" pod_name="sysctl-test" @@ -33,7 +34,8 @@ setup() { } teardown() { - [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" ]] && \ + [[ "${KATA_HYPERVISOR}" = "qemu-tdx" || "${KATA_HYPERVISOR}" = "qemu-coco-dev" || \ + "${KATA_HYPERVISOR}" = "qemu-sev" || "${KATA_HYPERVISOR}" = "qemu-snp" ]] && \ skip "See: https://github.com/kata-containers/kata-containers/issues/9666" # Debugging information diff --git a/tests/integration/kubernetes/runtimeclass_workloads/pod-file-volume.yaml b/tests/integration/kubernetes/runtimeclass_workloads/pod-file-volume.yaml index e7a194f42a..3c3b281b28 100644 --- a/tests/integration/kubernetes/runtimeclass_workloads/pod-file-volume.yaml +++ b/tests/integration/kubernetes/runtimeclass_workloads/pod-file-volume.yaml @@ -19,7 +19,7 @@ spec: type: File containers: - name: busybox-file-volume-container - image: busybox + image: quay.io/prometheus/busybox:latest volumeMounts: - name: shared-file mountPath: MOUNT_PATH diff --git a/tests/integration/kubernetes/runtimeclass_workloads/pod-readonly-volume.yaml b/tests/integration/kubernetes/runtimeclass_workloads/pod-readonly-volume.yaml index 8835bae999..a6e129aae9 100644 --- a/tests/integration/kubernetes/runtimeclass_workloads/pod-readonly-volume.yaml +++ b/tests/integration/kubernetes/runtimeclass_workloads/pod-readonly-volume.yaml @@ -18,7 +18,7 @@ spec: type: Directory containers: - name: busybox-ro-volume-container - image: busybox + image: quay.io/prometheus/busybox:latest volumeMounts: - name: shared-data mountPath: /tmp diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh old mode 100755 new mode 100644 index 80948214ca..d92fcb77d5 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -115,7 +115,7 @@ add_runtime_handler_annotations() { fi case "${KATA_HYPERVISOR}" in - qemu-tdx|qemu-coco-dev) + qemu-coco-dev | qemu-sev | qemu-snp | qemu-tdx) info "Add runtime handler annotations for ${KATA_HYPERVISOR}" local handler_value="kata-${KATA_HYPERVISOR}" for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml diff --git a/tests/integration/kubernetes/tests_common.sh b/tests/integration/kubernetes/tests_common.sh index 32a6f2ba21..97fabf2f3a 100644 --- a/tests/integration/kubernetes/tests_common.sh +++ b/tests/integration/kubernetes/tests_common.sh @@ -111,7 +111,7 @@ exec_host() { # [bats-exec-test:38] INFO: k8s configured to use runtimeclass # bash: line 1: $'\r': command not found # ``` - output="$(kubectl debug -qit "node/${node}" --image=alpine:latest -- chroot /host bash -c "${command}" | tr -d '\r')" + output="$(kubectl debug -qit "node/${node}" --image=ghcr.io/linuxcontainers/alpine:latest -- chroot /host bash -c "${command}" | tr -d '\r')" # Get the updated list of debugger pods. declare -a new_debugger_pods=( $(kubectl get pods -o name | grep node-debugger) )