diff --git a/tasks/sc2.py b/tasks/sc2.py index ee102c13..fc227f0b 100644 --- a/tasks/sc2.py +++ b/tasks/sc2.py @@ -48,7 +48,7 @@ replace_agent as replace_kata_agent, replace_shim as replace_kata_shim, ) -from tasks.util.kernel import get_host_kernel_expected_version, get_host_kernel_version +from tasks.util.kernel import get_host_kernel_expected_prefix, get_host_kernel_version from tasks.util.kubeadm import run_kubectl_command from tasks.util.registry import ( HOST_CERT_DIR, @@ -223,10 +223,10 @@ def deploy(ctx, debug=False, clean=False): # Fail-fast if we are not using the expected host kernel host_kernel_version = get_host_kernel_version() - host_kernel_expected_version = get_host_kernel_expected_version() - if host_kernel_version != host_kernel_expected_version: + host_kernel_expected_prefix = get_host_kernel_expected_prefix() + if not host_kernel_version.startswith(host_kernel_expected_prefix): print( - f"ERROR: wrong host kernel: expected {host_kernel_expected_version} " + f"ERROR: wrong host kernel: expected prefix {host_kernel_expected_prefix} " f"- got {host_kernel_version}" ) print("ERROR: install the right host kernel (./docs/host_kernel.md)") diff --git a/tasks/util/kernel.py b/tasks/util/kernel.py index bd4b1179..42dc3b90 100644 --- a/tasks/util/kernel.py +++ b/tasks/util/kernel.py @@ -3,7 +3,7 @@ from tasks.util.versions import HOST_KERNEL_VERSION_SNP, HOST_KERNEL_VERSION_TDX -def get_host_kernel_expected_version(): +def get_host_kernel_expected_prefix(): sc2_runtime_class = environ["SC2_RUNTIME_CLASS"] if "snp" in sc2_runtime_class: return HOST_KERNEL_VERSION_SNP diff --git a/tasks/util/versions.py b/tasks/util/versions.py index 8079a1df..acda86e4 100644 --- a/tasks/util/versions.py +++ b/tasks/util/versions.py @@ -30,7 +30,7 @@ # Kernel versions # WARNING: if we update the host kernel version, make sure to update it in the # table in ./docs/host_kernel.md -HOST_KERNEL_VERSION_SNP = "6.11.0-snp-host-cc2568386+" +HOST_KERNEL_VERSION_SNP = "6.11.0-snp-host-cc2568386" HOST_KERNEL_VERSION_TDX = "6.8.0-1013-intel" GUEST_KERNEL_VERSION = "6.12.8"