From a66cdebb85211b7b49db59867136cda5d50dccd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Tue, 7 Apr 2026 12:16:22 +0200 Subject: [PATCH] kata-deploy: add arm64 support for qemu-coco-dev shims MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add aarch64/arm64 to the list of supported architectures for qemu-coco-dev and qemu-coco-dev-runtime-rs shims across kata-deploy configuration, Helm chart values, and test helper scripts. Note that guest-components and the related build dependencies are not yet wired for arm64 in these configurations; those will be addressed separately. Signed-off-by: Fabiano Fidêncio Made-with: Cursor --- docs/helm-configuration.md | 2 +- tests/gha-run-k8s-common.sh | 6 +++++- tools/packaging/kata-deploy/binary/src/config.rs | 2 +- .../helm-chart/kata-deploy/try-kata-tee.values.yaml | 1 + .../kata-deploy/helm-chart/kata-deploy/values.yaml | 1 + 5 files changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/helm-configuration.md b/docs/helm-configuration.md index 2b55f36321..79b0bd4242 100644 --- a/docs/helm-configuration.md +++ b/docs/helm-configuration.md @@ -109,7 +109,7 @@ Includes: - `qemu-se-runtime-rs` - IBM Secure Execution for Linux (SEL) Rust runtime (s390x) - `qemu-cca` - Arm Confidential Compute Architecture (arm64) - `qemu-coco-dev` - Confidential Containers development (amd64, s390x) -- `qemu-coco-dev-runtime-rs` - Confidential Containers development Rust runtime (amd64, s390x) +- `qemu-coco-dev-runtime-rs` - Confidential Containers development Rust runtime (amd64, arm64, s390x) ### [`try-kata-nvidia-gpu.values.yaml`](https://github.com/kata-containers/kata-containers/blob/main/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-nvidia-gpu.values.yaml) diff --git a/tests/gha-run-k8s-common.sh b/tests/gha-run-k8s-common.sh index 4f132601f6..8e95ef293b 100644 --- a/tests/gha-run-k8s-common.sh +++ b/tests/gha-run-k8s-common.sh @@ -713,10 +713,14 @@ function helm_helper() { yq -i ".shims.${shim}.enabled = true" "${values_yaml}" yq -i ".shims.${shim}.supportedArches = [\"amd64\", \"arm64\", \"s390x\"]" "${values_yaml}" ;; - qemu-coco-dev|qemu-coco-dev-runtime-rs) + qemu-coco-dev) yq -i ".shims.${shim}.enabled = true" "${values_yaml}" yq -i ".shims.${shim}.supportedArches = [\"amd64\", \"s390x\"]" "${values_yaml}" ;; + qemu-coco-dev-runtime-rs) + yq -i ".shims.${shim}.enabled = true" "${values_yaml}" + yq -i ".shims.${shim}.supportedArches = [\"amd64\", \"arm64\", \"s390x\"]" "${values_yaml}" + ;; qemu-nvidia-gpu) yq -i ".shims.${shim}.enabled = true" "${values_yaml}" yq -i ".shims.${shim}.supportedArches = [\"amd64\", \"arm64\"]" "${values_yaml}" diff --git a/tools/packaging/kata-deploy/binary/src/config.rs b/tools/packaging/kata-deploy/binary/src/config.rs index 2b17bc3e2e..3f7f7e40a0 100644 --- a/tools/packaging/kata-deploy/binary/src/config.rs +++ b/tools/packaging/kata-deploy/binary/src/config.rs @@ -719,7 +719,7 @@ fn parse_custom_runtimes() -> Result> { fn get_default_shims_for_arch(arch: &str) -> &'static str { match arch { "x86_64" => "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx qemu-snp qemu-snp-runtime-rs qemu-tdx qemu-tdx-runtime-rs", - "aarch64" => "clh cloud-hypervisor dragonball fc qemu qemu-runtime-rs qemu-nvidia-gpu qemu-cca", + "aarch64" => "clh cloud-hypervisor dragonball fc qemu qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-gpu qemu-cca", "s390x" => "qemu qemu-runtime-rs qemu-se qemu-se-runtime-rs qemu-coco-dev qemu-coco-dev-runtime-rs", "ppc64le" => "qemu", _ => "qemu", // Fallback to qemu for unknown architectures diff --git a/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-tee.values.yaml b/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-tee.values.yaml index 42dad88ad6..f5986a564e 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-tee.values.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/try-kata-tee.values.yaml @@ -135,6 +135,7 @@ shims: enabled: true supportedArches: - amd64 + - arm64 - s390x allowedHypervisorAnnotations: [] containerd: diff --git a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml index 96b0040cda..9111891129 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml @@ -307,6 +307,7 @@ shims: enabled: ~ supportedArches: - amd64 + - arm64 - s390x allowedHypervisorAnnotations: [] containerd: