From 158ca17ae7a6ee1653d8e1060e8d065a86f078b8 Mon Sep 17 00:00:00 2001 From: "James O. D. Hunt" Date: Tue, 14 Nov 2023 17:09:25 +0000 Subject: [PATCH] kata-deploy: Add cloud-hypervisor MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now that we have a separate Cloud Hypervisor configuration file for the rust runtime, add it to the kata-deploy. See: https://github.com/kata-containers/kata-containers/pull/8250 Signed-off-by: James O. D. Hunt Signed-off-by: Fabiano Fidêncio --- .../kata-deploy/kata-cleanup/base/kata-cleanup.yaml | 2 +- .../kata-deploy/base/kata-deploy-stable.yaml | 2 +- .../kata-deploy/kata-deploy/base/kata-deploy.yaml | 2 +- .../runtimeclasses/kata-cloud-hypervisor.yaml | 13 +++++++++++++ .../runtimeclasses/kata-runtimeClasses.yaml | 13 +++++++++++++ tools/packaging/kata-deploy/scripts/kata-deploy.sh | 4 ++-- 6 files changed, 31 insertions(+), 5 deletions(-) create mode 100644 tools/packaging/kata-deploy/runtimeclasses/kata-cloud-hypervisor.yaml diff --git a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml index df7b715a9e..7239cdf8b5 100644 --- a/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml +++ b/tools/packaging/kata-deploy/kata-cleanup/base/kata-cleanup.yaml @@ -30,7 +30,7 @@ spec: - name: DEBUG value: "false" - name: SHIMS - value: "clh dragonball fc qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx qemu remote stratovirt" + value: "clh cloud-hypervisor dragonball fc qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx qemu stratovirt" - name: DEFAULT_SHIM value: "qemu" - name: CREATE_RUNTIMECLASSES diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml index aa466cfc6f..cf78b8e5c7 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy-stable.yaml @@ -32,7 +32,7 @@ spec: - name: DEBUG value: "false" - name: SHIMS - value: "clh dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx" + value: "clh cloud-hypervisor dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx" - name: DEFAULT_SHIM value: "qemu" - name: CREATE_RUNTIMECLASSES diff --git a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml index 03cbe4a53e..e746c6f32b 100644 --- a/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml +++ b/tools/packaging/kata-deploy/kata-deploy/base/kata-deploy.yaml @@ -32,7 +32,7 @@ spec: - name: DEBUG value: "false" - name: SHIMS - value: "clh dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx remote stratovirt" + value: "clh cloud-hypervisor dragonball fc qemu qemu-nvidia-gpu qemu-sev qemu-snp qemu-tdx stratovirt" - name: DEFAULT_SHIM value: "qemu" - name: CREATE_RUNTIMECLASSES diff --git a/tools/packaging/kata-deploy/runtimeclasses/kata-cloud-hypervisor.yaml b/tools/packaging/kata-deploy/runtimeclasses/kata-cloud-hypervisor.yaml new file mode 100644 index 0000000000..c9c16aa882 --- /dev/null +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-cloud-hypervisor.yaml @@ -0,0 +1,13 @@ +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 +metadata: + name: kata-cloud-hypervisor +handler: kata-cloud-hypervisor +overhead: + podFixed: + memory: "130Mi" + 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 8736ad6325..b96ac44f8e 100644 --- a/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml +++ b/tools/packaging/kata-deploy/runtimeclasses/kata-runtimeClasses.yaml @@ -14,6 +14,19 @@ scheduling: --- kind: RuntimeClass apiVersion: node.k8s.io/v1 +metadata: + name: kata-cloud-hypervisor +handler: kata-cloud-hypervisor +overhead: + podFixed: + memory: "130Mi" + cpu: "250m" +scheduling: + nodeSelector: + katacontainers.io/kata-runtime: "true" +--- +kind: RuntimeClass +apiVersion: node.k8s.io/v1 metadata: name: kata-dragonball handler: kata-dragonball diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 4836650339..58517480f6 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -134,7 +134,7 @@ function get_kata_containers_config_path() { # Map the runtime shim name to the appropriate configuration # file directory. case "$shim" in - dragonball) config_path="$rust_config_path" ;; + cloud-hypervisor | dragonball) config_path="$rust_config_path" ;; *) config_path="$golang_config_path" ;; esac @@ -247,7 +247,7 @@ function configure_different_shims_base() { # Map the runtime shim name to the appropriate # containerd-shim-kata-v2 binary case "$shim" in - dragonball) + cloud-hypervisor | dragonball) ln -sf /opt/kata/runtime-rs/bin/containerd-shim-kata-v2 "${shim_file}" ;; *) ln -sf /opt/kata/bin/containerd-shim-kata-v2 "${shim_file}" ;;