diff --git a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs index 760477427f..8b27c12723 100644 --- a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs +++ b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs @@ -33,6 +33,8 @@ const ALL_SHIMS: &[&str] = &[ "qemu-cca", "qemu-coco-dev", "qemu-coco-dev-runtime-rs", + "qemu-nvidia-cpu", + "qemu-nvidia-cpu-runtime-rs", "qemu-nvidia-gpu", "qemu-nvidia-gpu-runtime-rs", "qemu-nvidia-gpu-snp", @@ -1369,6 +1371,8 @@ mod tests { #[case("qemu-se", "qemu")] #[case("qemu-coco-dev", "qemu")] #[case("qemu-cca", "qemu")] + #[case("qemu-nvidia-cpu", "qemu")] + #[case("qemu-nvidia-cpu-runtime-rs", "qemu")] #[case("qemu-nvidia-gpu", "qemu")] #[case("qemu-nvidia-gpu-runtime-rs", "qemu")] #[case("qemu-nvidia-gpu-snp", "qemu")] diff --git a/tools/packaging/kata-deploy/binary/src/config.rs b/tools/packaging/kata-deploy/binary/src/config.rs index 8c7ffe4e73..9401673db5 100644 --- a/tools/packaging/kata-deploy/binary/src/config.rs +++ b/tools/packaging/kata-deploy/binary/src/config.rs @@ -886,8 +886,8 @@ fn parse_custom_runtimes() -> Result> { /// Returns only shims that are supported for that architecture fn get_default_shims_for_arch(arch: &str) -> &'static str { match arch { - "x86_64" => "clh clh-runtime-rs dragonball fc qemu qemu-coco-dev qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-gpu qemu-nvidia-gpu-runtime-rs qemu-nvidia-gpu-snp qemu-nvidia-gpu-snp-runtime-rs qemu-nvidia-gpu-tdx qemu-nvidia-gpu-tdx-runtime-rs qemu-snp qemu-snp-runtime-rs qemu-tdx qemu-tdx-runtime-rs", - "aarch64" => "clh clh-runtime-rs dragonball fc qemu qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-gpu qemu-cca", + "x86_64" => "clh clh-runtime-rs dragonball fc qemu qemu-coco-dev qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-cpu qemu-nvidia-cpu-runtime-rs qemu-nvidia-gpu qemu-nvidia-gpu-runtime-rs qemu-nvidia-gpu-snp qemu-nvidia-gpu-snp-runtime-rs qemu-nvidia-gpu-tdx qemu-nvidia-gpu-tdx-runtime-rs qemu-snp qemu-snp-runtime-rs qemu-tdx qemu-tdx-runtime-rs", + "aarch64" => "clh clh-runtime-rs dragonball fc qemu qemu-coco-dev-runtime-rs qemu-runtime-rs qemu-nvidia-cpu qemu-nvidia-cpu-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/binary/src/utils/system.rs b/tools/packaging/kata-deploy/binary/src/utils/system.rs index 1ba761c765..bf15e31c9f 100644 --- a/tools/packaging/kata-deploy/binary/src/utils/system.rs +++ b/tools/packaging/kata-deploy/binary/src/utils/system.rs @@ -11,6 +11,7 @@ pub const RUST_SHIMS: &[&str] = &[ "clh-runtime-rs", "dragonball", "qemu-runtime-rs", + "qemu-nvidia-cpu-runtime-rs", "qemu-nvidia-gpu-runtime-rs", "qemu-nvidia-gpu-snp-runtime-rs", "qemu-nvidia-gpu-tdx-runtime-rs", @@ -215,6 +216,7 @@ mod tests { "qemu-se", "qemu-coco-dev", "qemu-cca", + "qemu-nvidia-cpu", "qemu-nvidia-gpu", "qemu-nvidia-gpu-tdx", "qemu-nvidia-gpu-snp", diff --git a/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/runtimeclasses.yaml b/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/runtimeclasses.yaml index c03e582834..a1d0c23ae1 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/runtimeclasses.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/templates/runtimeclasses.yaml @@ -26,6 +26,8 @@ "qemu-snp-runtime-rs" (dict "memory" "2048Mi" "cpu" "1.0") "qemu-tdx" (dict "memory" "2048Mi" "cpu" "1.0") "qemu-tdx-runtime-rs" (dict "memory" "2048Mi" "cpu" "1.0") + "qemu-nvidia-cpu" (dict "memory" "320Mi" "cpu" "250m") + "qemu-nvidia-cpu-runtime-rs" (dict "memory" "320Mi" "cpu" "250m") "qemu-nvidia-gpu" (dict "memory" "10240Mi" "cpu" "1.0") "qemu-nvidia-gpu-runtime-rs" (dict "memory" "10240Mi" "cpu" "1.0") "qemu-nvidia-gpu-snp" (dict "memory" "10240Mi" "cpu" "1.0") 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 0ba43cd1e6..2eb272fcab 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml @@ -464,6 +464,24 @@ shims: containerd: snapshotter: "" + qemu-nvidia-cpu: + enabled: ~ + supportedArches: + - amd64 + - arm64 + allowedHypervisorAnnotations: [] + containerd: + snapshotter: "" + + qemu-nvidia-cpu-runtime-rs: + enabled: ~ + supportedArches: + - amd64 + - arm64 + allowedHypervisorAnnotations: [] + containerd: + snapshotter: "" + qemu-nvidia-gpu: enabled: ~ supportedArches: