From 3622b5e8b440ad0972c4761618339d1a8a1f6e30 Mon Sep 17 00:00:00 2001 From: Dan Mihai Date: Thu, 10 Oct 2024 22:11:53 +0000 Subject: [PATCH] ci: static_sandbox_resource_mgmt for cbl-mariner Use the configuration used by AKS (static_sandbox_resource_mgmt=true) for CI testing on Mariner hosts. Hopefully pod startup will become more predictable on these hosts - e.g., by avoiding the occasional hotplug timeouts described by #10413. Signed-off-by: Dan Mihai --- tools/packaging/kata-deploy/scripts/kata-deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/packaging/kata-deploy/scripts/kata-deploy.sh b/tools/packaging/kata-deploy/scripts/kata-deploy.sh index 79bfab26fd..1835488c2a 100755 --- a/tools/packaging/kata-deploy/scripts/kata-deploy.sh +++ b/tools/packaging/kata-deploy/scripts/kata-deploy.sh @@ -366,6 +366,8 @@ function install_artifacts() { # Allow Mariner to use custom configuration. if [ "${HOST_OS:-}" == "cbl-mariner" ]; then config_path="${host_install_dir}/share/defaults/kata-containers/configuration-clh.toml" + sed -i -E "s|(static_sandbox_resource_mgmt)=false|\1=true|" "${config_path}" + clh_path="${dest_dir}/bin/cloud-hypervisor-glibc" sed -i -E "s|(valid_hypervisor_paths) = .+|\1 = [\"${clh_path}\"]|" "${config_path}" sed -i -E "s|(path) = \".+/cloud-hypervisor\"|\1 = \"${clh_path}\"|" "${config_path}"