diff --git a/.github/workflows/build-kata-static-tarball-amd64.yaml b/.github/workflows/build-kata-static-tarball-amd64.yaml index bbabe8ff0e..021efe8d1c 100644 --- a/.github/workflows/build-kata-static-tarball-amd64.yaml +++ b/.github/workflows/build-kata-static-tarball-amd64.yaml @@ -53,7 +53,6 @@ jobs: - rootfs-image-mariner - rootfs-initrd - rootfs-initrd-confidential - - rootfs-initrd-mariner - runk - shim-v2 - trace-forwarder diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index ccfef0d63e..7934ab958c 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -183,7 +183,7 @@ function deploy_kata() { fi if [ "${KATA_HOST_OS}" = "cbl-mariner" ]; then - yq -i ".env.allowedHypervisorAnnotations = \"initrd kernel default_vcpus\"" "${values_yaml}" + yq -i ".env.allowedHypervisorAnnotations = \"image kernel default_vcpus kernel_params\"" "${values_yaml}" yq -i ".env.hostOS = \"${KATA_HOST_OS}\"" "${values_yaml}" fi diff --git a/tests/integration/kubernetes/setup.sh b/tests/integration/kubernetes/setup.sh index a72c7c743f..67c1a711f8 100644 --- a/tests/integration/kubernetes/setup.sh +++ b/tests/integration/kubernetes/setup.sh @@ -99,19 +99,22 @@ add_annotations_to_yaml() { esac } -add_cbl_mariner_kernel_initrd_annotations() { +add_cbl_mariner_specific_annotations() { if [[ "${KATA_HOST_OS}" = "cbl-mariner" ]]; then - info "Add kernel and initrd path and annotations for cbl-mariner" + info "Add kernel and image path and annotations for cbl-mariner" local mariner_annotation_kernel="io.katacontainers.config.hypervisor.kernel" local mariner_kernel_path="/usr/share/cloud-hypervisor/vmlinux.bin" - local mariner_annotation_initrd="io.katacontainers.config.hypervisor.initrd" - local mariner_initrd_path="/opt/kata/share/kata-containers/kata-containers-initrd-mariner.img" + local mariner_annotation_image="io.katacontainers.config.hypervisor.image" + local mariner_image_path="/opt/kata/share/kata-containers/kata-containers-mariner.img" + local mariner_annotation_kernel_params="io.katacontainers.config.hypervisor.kernel_params" + local mariner_kernel_params="SYSTEMD_CGROUP_ENABLE_LEGACY_FORCE=1 systemd.legacy_systemd_cgroup_controller=yes systemd.unified_cgroup_hierarchy=0" for K8S_TEST_YAML in runtimeclass_workloads_work/*.yaml do add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_kernel}" "${mariner_kernel_path}" - add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_initrd}" "${mariner_initrd_path}" + add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_image}" "${mariner_image_path}" + add_annotations_to_yaml "${K8S_TEST_YAML}" "${mariner_annotation_kernel_params}" "${mariner_kernel_params}" done fi } @@ -139,7 +142,7 @@ add_runtime_handler_annotations() { main() { ensure_yq reset_workloads_work_dir - add_cbl_mariner_kernel_initrd_annotations + add_cbl_mariner_specific_annotations add_runtime_handler_annotations }