From 19df157d6f95e851edfdceb1b801da3b3fec99f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabiano=20Fid=C3=AAncio?= Date: Mon, 18 May 2026 14:47:43 +0200 Subject: [PATCH] fixup! versions: bump containerd version to 2.3 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit tests/cri-containerd: fix containerd config version detection Containerd v2.3.0 outputs `version = 4` in its default config, not `version = 3`. The grep check only matched version 3, causing the config generator to fall back to the old `[plugins.cri]` format. Containerd 2.3's auto-migration from version 0 does not properly handle custom runtimes defined in the old format, so kata-dragonball was never registered and the CRI plugin failed to start. Match both version 3 and 4 so the new-style plugin ID is used. Signed-off-by: Fabiano Fidêncio --- tests/integration/cri-containerd/integration-tests.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/integration/cri-containerd/integration-tests.sh b/tests/integration/cri-containerd/integration-tests.sh index 7ebe44197e..7a144cea34 100755 --- a/tests/integration/cri-containerd/integration-tests.sh +++ b/tests/integration/cri-containerd/integration-tests.sh @@ -113,7 +113,7 @@ function create_containerd_config() { fi # check containerd config version - if containerd config default | grep -q "version = 3\>"; then + if containerd config default | grep -qE "^version = [34]"; then pluginid=\"io.containerd.cri.v1.runtime\" else pluginid="cri" @@ -670,6 +670,8 @@ function main() { pushd "containerd" + export_go_toolchain_for_containerd_source_builds + # Make sure the right artifacts are going to be built sudo make clean