diff --git a/.github/workflows/basic-ci-amd64.yaml b/.github/workflows/basic-ci-amd64.yaml index 515ed1b6c0..07d4ed2945 100644 --- a/.github/workflows/basic-ci-amd64.yaml +++ b/.github/workflows/basic-ci-amd64.yaml @@ -29,7 +29,7 @@ jobs: fail-fast: false matrix: containerd_version: ['active'] - vmm: ['dragonball', 'cloud-hypervisor', 'qemu-runtime-rs'] + vmm: ['dragonball', 'clh-runtime-rs', 'qemu-runtime-rs'] concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-sandboxapi-amd64-${{ toJSON(matrix) }} cancel-in-progress: true @@ -95,7 +95,7 @@ jobs: fail-fast: false matrix: containerd_version: ['lts', 'active'] - vmm: ['clh', 'cloud-hypervisor', 'dragonball', 'qemu', 'qemu-runtime-rs'] + vmm: ['clh', 'clh-runtime-rs', 'dragonball', 'qemu', 'qemu-runtime-rs'] concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-run-containerd-stability-amd64-${{ toJSON(matrix) }} cancel-in-progress: true @@ -250,7 +250,7 @@ jobs: - clh - dragonball - qemu - - cloud-hypervisor + - clh-runtime-rs - qemu-runtime-rs concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-nerdctl-amd64-${{ toJSON(matrix) }} diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index e84e245912..981ab9af52 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -406,12 +406,12 @@ jobs: { containerd_version: lts, vmm: clh }, { containerd_version: lts, vmm: dragonball }, { containerd_version: lts, vmm: qemu }, - { containerd_version: lts, vmm: cloud-hypervisor }, + { containerd_version: lts, vmm: clh-runtime-rs }, { containerd_version: lts, vmm: qemu-runtime-rs }, { containerd_version: active, vmm: clh }, { containerd_version: active, vmm: dragonball }, { containerd_version: active, vmm: qemu }, - { containerd_version: active, vmm: cloud-hypervisor }, + { containerd_version: active, vmm: clh-runtime-rs }, { containerd_version: active, vmm: qemu-runtime-rs }, ] concurrency: diff --git a/.github/workflows/run-k8s-tests-on-aks.yaml b/.github/workflows/run-k8s-tests-on-aks.yaml index 1ca6637096..020528fdfa 100644 --- a/.github/workflows/run-k8s-tests-on-aks.yaml +++ b/.github/workflows/run-k8s-tests-on-aks.yaml @@ -58,10 +58,10 @@ jobs: vmm: clh instance-type: normal - host_os: cbl-mariner - vmm: cloud-hypervisor + vmm: clh-runtime-rs instance-type: small - host_os: cbl-mariner - vmm: cloud-hypervisor + vmm: clh-runtime-rs instance-type: normal concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-run-k8s-tests-aks-${{ toJSON(matrix) }} diff --git a/.github/workflows/run-k8s-tests-on-free-runner.yaml b/.github/workflows/run-k8s-tests-on-free-runner.yaml index d5d5a9bf54..9845bb308b 100644 --- a/.github/workflows/run-k8s-tests-on-free-runner.yaml +++ b/.github/workflows/run-k8s-tests-on-free-runner.yaml @@ -48,8 +48,8 @@ jobs: { vmm: qemu, containerd_version: active }, { vmm: qemu-runtime-rs, containerd_version: lts }, { vmm: qemu-runtime-rs, containerd_version: active }, - { vmm: cloud-hypervisor, containerd_version: lts }, - { vmm: cloud-hypervisor, containerd_version: active }, + { vmm: clh-runtime-rs, containerd_version: lts }, + { vmm: clh-runtime-rs, containerd_version: active }, ] concurrency: group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-free-runner-${{ toJSON(matrix) }} diff --git a/docs/design/virtualization.md b/docs/design/virtualization.md index 684e912b55..a290b9bae4 100644 --- a/docs/design/virtualization.md +++ b/docs/design/virtualization.md @@ -197,7 +197,7 @@ Cloud Hypervisor is a Rust-based VMM designed for modern cloud workloads with a - Applications requiring memory/CPU resizing - Security-sensitive deployments (seccomp isolation) -**Configuration:** See [`configuration-cloud-hypervisor.toml`](../../src/runtime-rs/config/configuration-cloud-hypervisor.toml.in) +**Configuration:** See [`configuration-clh-runtime-rs.toml`](../../src/runtime-rs/config/configuration-clh-runtime-rs.toml.in) ### Firecracker/KVM @@ -274,7 +274,7 @@ Each hypervisor has a dedicated configuration file: | Hypervisor | Rust Runtime Configuration | Go Runtime Configuration | |------------|----------------|-----------------| | QEMU |`configuration-qemu-runtime-rs.toml` |`configuration-qemu.toml` | -| Cloud Hypervisor | `configuration-cloud-hypervisor.toml` | `configuration-clh.toml` | +| Cloud Hypervisor | `configuration-clh-runtime-rs.toml` | `configuration-clh.toml` | | Firecracker | `configuration-rs-fc.toml` | `configuration-fc.toml` | | Dragonball | `configuration-dragonball.toml` (default) | `No` | diff --git a/docs/helm-configuration.md b/docs/helm-configuration.md index 0ae4bc5b74..6b0d9db5a4 100644 --- a/docs/helm-configuration.md +++ b/docs/helm-configuration.md @@ -177,7 +177,7 @@ Now verify the installation by examining the `runtimeClasses`: $ kubectl get runtimeClasses NAME HANDLER AGE kata-clh-cicd kata-clh-cicd 77s -kata-cloud-hypervisor-cicd kata-cloud-hypervisor-cicd 77s +kata-clh-runtime-rs-cicd kata-clh-runtime-rs-cicd 77s kata-dragonball-cicd kata-dragonball-cicd 77s kata-fc-cicd kata-fc-cicd 77s kata-qemu-cicd kata-qemu-cicd 77s diff --git a/src/runtime-rs/Makefile b/src/runtime-rs/Makefile index d587fa0d91..f281a4c4e8 100644 --- a/src/runtime-rs/Makefile +++ b/src/runtime-rs/Makefile @@ -87,7 +87,8 @@ RUNTIMENAME := virt_container HYPERVISOR_DB = dragonball HYPERVISOR_FC = firecracker HYPERVISOR_QEMU = qemu -HYPERVISOR_CLH = cloud-hypervisor +HYPERVISOR_CLH = clh-runtime-rs +HYPERVISOR_NAME_CLH = cloud-hypervisor HYPERVISOR_REMOTE = remote ARCH_SUPPORT_DB := x86_64 aarch64 @@ -272,7 +273,7 @@ endif ifneq (,$(CLHCMD)) KNOWN_HYPERVISORS += $(HYPERVISOR_CLH) - CONFIG_FILE_CLH = configuration-cloud-hypervisor.toml + CONFIG_FILE_CLH = configuration-clh-runtime-rs.toml CONFIG_CLH = config/$(CONFIG_FILE_CLH) CONFIG_CLH_IN = $(CONFIG_CLH).in @@ -608,6 +609,7 @@ USER_VARS += BUILDFLAGS USER_VARS += RUNTIMENAME USER_VARS += HYPERVISOR_DB USER_VARS += HYPERVISOR_CLH +USER_VARS += HYPERVISOR_NAME_CLH USER_VARS += HYPERVISOR_QEMU USER_VARS += HYPERVISOR_FC USER_VARS += PIPESIZE diff --git a/src/runtime-rs/README.md b/src/runtime-rs/README.md index fe6f8e10dc..8889aac0cc 100644 --- a/src/runtime-rs/README.md +++ b/src/runtime-rs/README.md @@ -145,7 +145,7 @@ Specify hypervisor during installation: ```bash sudo make install HYPERVISOR=qemu # or -sudo make install HYPERVISOR=cloud-hypervisor +sudo make install HYPERVISOR=clh-runtime-rs ``` ## Configuration @@ -156,7 +156,7 @@ Configuration files in `config/`: |-------------|------------|-------| | `configuration-dragonball.toml.in` | Dragonball | Built-in VMM | | `configuration-qemu-runtime-rs.toml.in` | QEMU | Default external | -| `configuration-cloud-hypervisor.toml.in` | Cloud Hypervisor | Modern VMM | +| `configuration-clh-runtime-rs.toml.in` | Cloud Hypervisor | Modern VMM | | `configuration-rs-fc.toml.in` | Firecracker | Lightweight microVM | | `configuration-remote.toml.in` | Remote | Remote hypervisor | | `configuration-qemu-tdx-runtime-rs.toml.in` | QEMU + TDX | Intel TDX confidential computing | diff --git a/src/runtime-rs/config/configuration-cloud-hypervisor.toml.in b/src/runtime-rs/config/configuration-clh-runtime-rs.toml.in similarity index 99% rename from src/runtime-rs/config/configuration-cloud-hypervisor.toml.in rename to src/runtime-rs/config/configuration-clh-runtime-rs.toml.in index 97f890791c..eeeba80048 100644 --- a/src/runtime-rs/config/configuration-cloud-hypervisor.toml.in +++ b/src/runtime-rs/config/configuration-clh-runtime-rs.toml.in @@ -461,7 +461,7 @@ keep_abnormal = false internetworking_model = "@DEFNETWORKMODEL_CLH@" name = "@RUNTIMENAME@" -hypervisor_name = "@HYPERVISOR_CLH@" +hypervisor_name = "@HYPERVISOR_NAME_CLH@" agent_name = "@PROJECT_TYPE@" # disable guest seccomp diff --git a/src/tools/agent-ctl/src/vm/vm_ops.rs b/src/tools/agent-ctl/src/vm/vm_ops.rs index dcadb4dc4b..9cca69be69 100644 --- a/src/tools/agent-ctl/src/vm/vm_ops.rs +++ b/src/tools/agent-ctl/src/vm/vm_ops.rs @@ -38,7 +38,7 @@ use tokio::sync::RwLock; any(target_arch = "x86_64", target_arch = "aarch64") ))] const CLH_CONFIG_PATH: &str = - "/opt/kata/share/defaults/kata-containers/runtime-rs/configuration-cloud-hypervisor.toml"; + "/opt/kata/share/defaults/kata-containers/runtime-rs/configuration-clh-runtime-rs.toml"; // qemu specific configuration path const QEMU_CONFIG_PATH: &str = diff --git a/tests/common.bash b/tests/common.bash index 9ce0454c43..ff962dd347 100644 --- a/tests/common.bash +++ b/tests/common.bash @@ -556,7 +556,7 @@ function enabling_hypervisor() { declare -r CONTAINERD_SHIM_KATA="/usr/local/bin/containerd-shim-kata-${KATA_HYPERVISOR}-v2" case "${KATA_HYPERVISOR}" in - dragonball|cloud-hypervisor|qemu-runtime-rs|qemu-se-runtime-rs) + dragonball|clh-runtime-rs|qemu-runtime-rs|qemu-se-runtime-rs) sudo ln -sf "${KATA_DIR}/runtime-rs/bin/containerd-shim-kata-v2" "${CONTAINERD_SHIM_KATA}" declare -r CONFIG_DIR="${KATA_DIR}/share/defaults/kata-containers/runtime-rs" ;; diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 46b983a080..4c14e5219f 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -683,7 +683,7 @@ function main() { passing_test="TestContainerStats|TestContainerRestart|TestContainerListStatsWithIdFilter|TestContainerListStatsWithIdSandboxIdFilter|TestDuplicateName|TestImageLoad|TestImageFSInfo|TestSandboxCleanRemove" - if [[ "${KATA_HYPERVISOR}" == "cloud-hypervisor" || \ + if [[ "${KATA_HYPERVISOR}" == "clh-runtime-rs" || \ "${KATA_HYPERVISOR}" == "qemu" ]]; then issue="https://github.com/kata-containers/tests/issues/2318" info "${KATA_HYPERVISOR} fails with TestContainerListStatsWithSandboxIdFilter }" diff --git a/tests/integration/kubernetes/gha-run.sh b/tests/integration/kubernetes/gha-run.sh index 01cb7440cf..80c1b7374f 100755 --- a/tests/integration/kubernetes/gha-run.sh +++ b/tests/integration/kubernetes/gha-run.sh @@ -312,7 +312,7 @@ function run_tests() { echo "start_time=${start_time}" >> "${GITHUB_ENV}" fi - if [[ "${KATA_HYPERVISOR}" = "cloud-hypervisor" ]] && [[ "${SNAPSHOTTER}" = "devmapper" ]]; then + if [[ "${KATA_HYPERVISOR}" = "clh-runtime-rs" ]] && [[ "${SNAPSHOTTER}" = "devmapper" ]]; then if [[ -n "${GITHUB_ENV}" ]]; then KATA_TEST_VERBOSE=true export KATA_TEST_VERBOSE diff --git a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs index 701339e9b1..b1cb7b0849 100644 --- a/tools/packaging/kata-deploy/binary/src/artifacts/install.rs +++ b/tools/packaging/kata-deploy/binary/src/artifacts/install.rs @@ -19,7 +19,7 @@ use walkdir::WalkDir; const ALL_SHIMS: &[&str] = &[ // Non-QEMU shims "clh", - "cloud-hypervisor", + "clh-runtime-rs", "dragonball", "fc", "firecracker", @@ -59,7 +59,7 @@ fn get_hypervisor_name(shim: &str) -> Result<&str> { match shim { "clh" => Ok("clh"), - "cloud-hypervisor" => Ok("cloud-hypervisor"), + "clh-runtime-rs" => Ok("cloud-hypervisor"), "dragonball" => Ok("dragonball"), "fc" | "firecracker" => Ok("firecracker"), "remote" => Ok("remote"), @@ -722,7 +722,7 @@ fn get_hypervisor_path(config: &Config, shim: &str) -> Result { } else { // For non-QEMU shims, use the appropriate hypervisor binary let binary = match shim { - "clh" | "cloud-hypervisor" => "cloud-hypervisor", + "clh" | "clh-runtime-rs" => "cloud-hypervisor", "fc" | "firecracker" => "firecracker", "dragonball" => "dragonball", "stratovirt" => "stratovirt", @@ -1068,7 +1068,7 @@ mod tests { #[rstest] #[case("clh", "clh")] - #[case("cloud-hypervisor", "cloud-hypervisor")] + #[case("clh-runtime-rs", "cloud-hypervisor")] #[case("dragonball", "dragonball")] #[case("fc", "firecracker")] #[case("firecracker", "firecracker")] diff --git a/tools/packaging/kata-deploy/binary/src/config.rs b/tools/packaging/kata-deploy/binary/src/config.rs index 08c7e63a1b..55583c7477 100644 --- a/tools/packaging/kata-deploy/binary/src/config.rs +++ b/tools/packaging/kata-deploy/binary/src/config.rs @@ -733,8 +733,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 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-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-gpu qemu-nvidia-gpu-snp qemu-nvidia-gpu-tdx 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", "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/k8s/runtimeclasses.rs b/tools/packaging/kata-deploy/binary/src/k8s/runtimeclasses.rs index 138e58ad06..ab335961c4 100644 --- a/tools/packaging/kata-deploy/binary/src/k8s/runtimeclasses.rs +++ b/tools/packaging/kata-deploy/binary/src/k8s/runtimeclasses.rs @@ -116,7 +116,7 @@ mod tests { #[test] fn test_multiple_shims_with_suffix() { // Test different shims with suffix - let shims = vec!["qemu", "qemu-tdx", "cloud-hypervisor", "fc"]; + let shims = vec!["qemu", "qemu-tdx", "clh-runtime-rs", "fc"]; let suffix = Some("staging".to_string()); for shim in shims { diff --git a/tools/packaging/kata-deploy/binary/src/utils/system.rs b/tools/packaging/kata-deploy/binary/src/utils/system.rs index 9cdf6df084..3e5f286d67 100644 --- a/tools/packaging/kata-deploy/binary/src/utils/system.rs +++ b/tools/packaging/kata-deploy/binary/src/utils/system.rs @@ -7,7 +7,7 @@ use anyhow::{Context, Result}; use std::process::Command; pub const RUST_SHIMS: &[&str] = &[ - "cloud-hypervisor", + "clh-runtime-rs", "dragonball", "qemu-runtime-rs", "qemu-coco-dev-runtime-rs", @@ -102,7 +102,7 @@ mod tests { #[case("fc", "/opt/kata", "/opt/kata/share/defaults/kata-containers")] #[case("clh", "/opt/kata", "/opt/kata/share/defaults/kata-containers")] #[case( - "cloud-hypervisor", + "clh-runtime-rs", "/opt/kata", "/opt/kata/share/defaults/kata-containers/runtime-rs" )] @@ -113,7 +113,7 @@ mod tests { )] #[case("qemu", "/custom/path", "/custom/path/share/defaults/kata-containers")] #[case( - "cloud-hypervisor", + "clh-runtime-rs", "/custom/path", "/custom/path/share/defaults/kata-containers/runtime-rs" )] @@ -146,9 +146,9 @@ mod tests { "/opt/kata/share/defaults/kata-containers/runtimes/fc" )] #[case( - "cloud-hypervisor", + "clh-runtime-rs", "/opt/kata", - "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/cloud-hypervisor" + "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/clh-runtime-rs" )] #[case( "qemu-runtime-rs", @@ -195,7 +195,7 @@ mod tests { "/custom/path/bin/containerd-shim-kata-v2", ); assert_runtime_paths( - &["cloud-hypervisor"], + &["clh-runtime-rs"], "/custom/path", "/custom/path/runtime-rs/bin/containerd-shim-kata-v2", ); @@ -265,7 +265,7 @@ mod tests { fn test_full_deployment_paths_rust_runtime() { // Test complete deployment structure for Rust runtime let dest_dir = "/opt/kata"; - let shim = "cloud-hypervisor"; + let shim = "clh-runtime-rs"; let config_path = get_kata_containers_config_path(shim, dest_dir); let original_path = get_kata_containers_original_config_path(shim, dest_dir); @@ -274,7 +274,7 @@ mod tests { // Expected paths for Rust runtime with per-shim directory assert_eq!( config_path, - "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/cloud-hypervisor" + "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/clh-runtime-rs" ); assert_eq!( original_path, @@ -289,7 +289,7 @@ mod tests { let config_file = format!("{}/configuration-{}.toml", config_path, shim); assert_eq!( config_file, - "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/cloud-hypervisor/configuration-cloud-hypervisor.toml" + "/opt/kata/share/defaults/kata-containers/runtime-rs/runtimes/clh-runtime-rs/configuration-clh-runtime-rs.toml" ); } @@ -303,8 +303,8 @@ mod tests { let qemu_binary = get_kata_containers_runtime_path("qemu", dest_dir); // Rust runtime - let clh_config = get_kata_containers_config_path("cloud-hypervisor", dest_dir); - let clh_binary = get_kata_containers_runtime_path("cloud-hypervisor", dest_dir); + let clh_config = get_kata_containers_config_path("clh-runtime-rs", dest_dir); + let clh_binary = get_kata_containers_runtime_path("clh-runtime-rs", dest_dir); // Both should have different paths assert_ne!(qemu_config, clh_config); @@ -315,7 +315,7 @@ mod tests { assert!(qemu_binary.ends_with("/bin/containerd-shim-kata-v2")); // Verify Rust runtime paths include per-shim directory - assert!(clh_config.contains("/runtimes/cloud-hypervisor")); + assert!(clh_config.contains("/runtimes/clh-runtime-rs")); assert!(clh_binary.ends_with("/runtime-rs/bin/containerd-shim-kata-v2")); } } diff --git a/tools/packaging/kata-deploy/binary/src/utils/toml.rs b/tools/packaging/kata-deploy/binary/src/utils/toml.rs index 7e1df11b9c..77c99549b3 100644 --- a/tools/packaging/kata-deploy/binary/src/utils/toml.rs +++ b/tools/packaging/kata-deploy/binary/src/utils/toml.rs @@ -960,7 +960,7 @@ kernel_params = "console=hvc0" .and_then(|p| p.parent()) .and_then(|p| p.parent()) .and_then(|p| p.parent()) - .map(|p| p.join("src/runtime-rs/config/configuration-cloud-hypervisor.toml.in")); + .map(|p| p.join("src/runtime-rs/config/configuration-clh-runtime-rs.toml.in")); if let Some(ref path) = config_path { if path.exists() { @@ -996,7 +996,7 @@ kernel_params = "console=hvc0" .replace("@DEFVIRTIOFSEXTRAARGS@", "[]") .replace("@DEFVIRTIOFSDAEMON@", "virtiofsd") .replace("@DEFSHAREDFS_CLH_VIRTIOFS@", "virtio-fs") - .replace("@HYPERVISOR_CLH@", "cloud-hypervisor") + .replace("@HYPERVISOR_NAME_CLH@", "cloud-hypervisor") .replace("@PROJECT_NAME@", "kata-containers") .replace("@PROJECT_TYPE@", "kata") .replace("@RUNTIMENAME@", "kata-runtime") @@ -1142,7 +1142,7 @@ kernel_params = "console=hvc0" let go_config = base.join("src/runtime/config/configuration-qemu.toml.in"); // Rust runtime config let rust_config = - base.join("src/runtime-rs/config/configuration-cloud-hypervisor.toml.in"); + base.join("src/runtime-rs/config/configuration-clh-runtime-rs.toml.in"); if go_config.exists() && rust_config.exists() { // Create temp copies 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 24ab4d526c..95cf00b15d 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 @@ -95,7 +95,7 @@ scheduling: {{- $runtimeClassConfigs := dict "clh" (dict "memory" "130Mi" "cpu" "250m") - "cloud-hypervisor" (dict "memory" "130Mi" "cpu" "250m") + "clh-runtime-rs" (dict "memory" "130Mi" "cpu" "250m") "dragonball" (dict "memory" "130Mi" "cpu" "250m") "fc" (dict "memory" "130Mi" "cpu" "250m") "qemu" (dict "memory" "160Mi" "cpu" "250m") 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 918eac1d09..1baaf8de1b 100644 --- a/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml +++ b/tools/packaging/kata-deploy/helm-chart/kata-deploy/values.yaml @@ -98,7 +98,7 @@ shims: containerd: snapshotter: "" - cloud-hypervisor: + clh-runtime-rs: enabled: ~ supportedArches: - amd64 @@ -455,7 +455,7 @@ verification: # Then deploy with: # helm install kata-deploy ./kata-deploy -f custom-runtimes.values.yaml # -# Available base configs: qemu, qemu-nvidia-gpu, qemu-snp, qemu-tdx, cloud-hypervisor, fc, etc. +# Available base configs: qemu, qemu-nvidia-gpu, qemu-snp, qemu-tdx, clh-runtime-rs, fc, etc. # The correct shim binary is automatically selected based on the baseConfig. # customRuntimes: diff --git a/tools/testing/gatekeeper/required-tests.yaml b/tools/testing/gatekeeper/required-tests.yaml index 98c3f6e068..d950886482 100644 --- a/tools/testing/gatekeeper/required-tests.yaml +++ b/tools/testing/gatekeeper/required-tests.yaml @@ -45,17 +45,17 @@ mapping: names: # ci-on-push.yaml (ci.yaml) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, clh) - - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, cloud-hypervisor) + - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, clh-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, qemu) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, qemu-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, clh) - - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, cloud-hypervisor) + - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, clh-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, qemu) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, qemu-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-kata-agent-apis - - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (cloud-hypervisor) + - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (clh-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (qemu) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (qemu-runtime-rs) @@ -65,13 +65,13 @@ mapping: - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (lts, clh) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (lts, dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (lts, qemu) - - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, cloud-hypervisor) / run-cri-containerd-amd64 (active, cloud-hypervisor) + - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, clh-runtime-rs) / run-cri-containerd-amd64 (active, clh-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, clh) / run-cri-containerd-amd64 (active, clh) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, dragonball) / run-cri-containerd-amd64 (active, dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, qemu-runtime-rs) / run-cri-containerd-amd64 (active, qemu-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (active, qemu) / run-cri-containerd-amd64 (active, qemu) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, clh) / run-cri-containerd-amd64 (lts, clh) - - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, cloud-hypervisor) / run-cri-containerd-amd64 (lts, cloud-hypervisor) + - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, clh-runtime-rs) / run-cri-containerd-amd64 (lts, clh-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, dragonball) / run-cri-containerd-amd64 (lts, dragonball) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, qemu-runtime-rs) / run-cri-containerd-amd64 (lts, qemu-runtime-rs) - Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-amd64 (lts, qemu) / run-cri-containerd-amd64 (lts, qemu) @@ -80,8 +80,8 @@ mapping: - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, normal) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, small, containerd) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh, small, oci-distribution) - - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, cloud-hypervisor, small) - - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, cloud-hypervisor, normal) + - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh-runtime-rs, small) + - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh-runtime-rs, normal) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh, lts) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh, active) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (dragonball, lts) @@ -90,8 +90,8 @@ mapping: - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (qemu, active) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (qemu-runtime-rs, lts) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (qemu-runtime-rs, active) - - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (cloud-hypervisor, lts) - - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (cloud-hypervisor, active) + - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh-runtime-rs, lts) + - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh-runtime-rs, active) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-zvsi / run-k8s-tests (devmapper, qemu, kubeadm) - Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-zvsi / run-k8s-tests (nydus, qemu-coco-dev, kubeadm) - Kata Containers CI / kata-containers-ci-on-push / run-kata-coco-tests / run-k8s-tests-on-tee (sev-snp, qemu-snp)