From 377ccc00df1d003f08fa48b361852d82c43e872b Mon Sep 17 00:00:00 2001 From: Wainer dos Santos Moschetta Date: Mon, 10 Jun 2024 11:16:02 -0300 Subject: [PATCH] kata-deploy: add qemu-runtime-rs runtimeClass Allow kata-deploy to install and configure the qemu-runtime-rs runtimeClass which ties to qemu hypervisor implementation in rust for the runtime-rs. Fixes: #9804 Signed-off-by: Wainer dos Santos Moschetta --- .../runtimeclasses/kata-qemu-runtime-rs.yaml | 13 +++++++++++++ .../runtimeclasses/kata-runtimeClasses.yaml | 13 +++++++++++++ tools/packaging/kata-deploy/scripts/kata-deploy.sh | 4 ++-- 3 files changed, 28 insertions(+), 2 deletions(-) create mode 100644 tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs.yaml diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs.yaml new file mode 100644 index 000000000000..f92a3ea1c016 --- /dev/null +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-qemu-runtime-rs.yaml @@ -0,0 +1,13 @@ +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 +metadata: + name: kata-qemu-runtime-rs +handler: kata-qemu-runtime-rs +overhead: + podFixed: + memory: "160Mi" + cpu: "250m" +scheduling: + nodeSelector: + katacontainers.io/kata-runtime: "true" diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml index 06d60e7dc36b..82a5c650c6a7 100644 --- a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml @@ -105,6 +105,19 @@ scheduling: --- kind: RuntimeClass apiVersion: node.k8s.io/v1 +metadata: + name: kata-qemu-runtime-rs +handler: kata-qemu-runtime-rs +overhead: + podFixed: + memory: "160Mi" + cpu: "250m" +scheduling: + nodeSelector: + katacontainers.io/kata-runtime: "true" +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 metadata: name: kata-qemu-se handler: kata-qemu-se diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 27be984a2cfe..23c3a291f5e8 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -151,7 +151,7 @@ function get_kata_containers_config_path() { # Map the runtime shim name to the appropriate configuration # file directory. case "$shim" in - cloud-hypervisor | dragonball) config_path="$rust_config_path" ;; + cloud-hypervisor | dragonball | qemu-runtime-rs) config_path="$rust_config_path" ;; *) config_path="$golang_config_path" ;; esac @@ -360,7 +360,7 @@ function configure_different_shims_base() { # Map the runtime shim name to the appropriate # containerd-shim-kata-v2 binary case "$shim" in - cloud-hypervisor | dragonball) + cloud-hypervisor | dragonball | qemu-runtime-rs) ln -sf /opt/kata/runtime-rs/bin/containerd-shim-kata-v2 "${shim_file}" ;; *) ln -sf /opt/kata/bin/containerd-shim-kata-v2 "${shim_file}" ;;