kubernetes · ComradeProgrammer · Aug 18, 2025 · Aug 25, 2025 · Aug 25, 2025
diff --git a/Makefile b/Makefile
@@ -24,7 +24,7 @@ KIC_VERSION ?= $(shell grep -E "Version =" pkg/drivers/kic/types.go | cut -d \"
 HUGO_VERSION ?= $(shell grep -E "HUGO_VERSION = \"" netlify.toml | cut -d \" -f2)
 
 # Default to .0 for higher cache hit rates, as build increments typically don't require new ISO versions
-ISO_VERSION ?= v1.36.0-1752940814-21089
+ISO_VERSION ?= v1.36.0-1756140137-21368
 
 # Dashes are valid in semver, but not Linux packaging. Use ~ to delimit alpha/beta
 DEB_VERSION ?= $(subst -,~,$(RAW_VERSION))

diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.hash
@@ -1,42 +1,2 @@
-sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a v1.2.0.tar.gz
-sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 v1.2.5.tar.gz
-sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 v1.2.6.tar.gz
-sha256 6165ae2ad669d9ec6d317492d30a1511365bd31ad29efae757f19c1828bf75b3 v1.2.8.tar.gz
-sha256 a0965e1492fca558629826f1aa89a9675de3d451cec67540400b30c0bf6ac387 v1.2.10.tar.gz
-sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 v1.2.12.tar.gz
-sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 v1.2.13.tar.gz
-sha256 d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded v1.3.7.tar.gz
-sha256 9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0 v1.3.9.tar.gz
-sha256 bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 v1.4.3.tar.gz
-sha256 ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1 v1.4.4.tar.gz
-sha256 285a3f4c00a87538bd7d0a82a0a8a758458c02b925349f44f3189f480c326038 v1.4.6.tar.gz
-sha256 3bb9f54be022067847f5930d21ebbfe4e7a67f589d78930aa0ac713492c28bcc v1.4.9.tar.gz
-sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12.tar.gz
-sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz
-sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz
-sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz
-sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz
-sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 v1.6.8.tar.gz
-sha256 a034b2273533207d5d96bef8bd3fce1efff85139815efb756d90c705ae1a05ce v1.6.9.tar.gz
-sha256 ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004 v1.6.15.tar.gz
-sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.tar.gz
-sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
-sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.tar.gz
-sha256 fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a v1.7.1.tar.gz
-sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.tar.gz
-sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.tar.gz
-sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
-sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
-sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
-sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz
-sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
-sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz
-sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
-sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.tar.gz
-sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
-sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz
-sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz
-sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz
-sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz
-sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz
-sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz
+sha256 846d13bc2bf1c01ae2f20d13beb9b3a1e50b52c86e955b4ac7d658f5847f2b0e  containerd-2.1.4-linux-arm64.tar.gz
+
diff --git a/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk b/deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
@@ -1,56 +1,32 @@
 ################################################################################
 #
-# containerd
+# crictl-bin
 #
 ################################################################################
-CONTAINERD_BIN_AARCH64_VERSION = v1.7.23
-CONTAINERD_BIN_AARCH64_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27
-CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/archive
-CONTAINERD_BIN_AARCH64_SOURCE = $(CONTAINERD_BIN_AARCH64_VERSION).tar.gz
-CONTAINERD_BIN_AARCH64_DEPENDENCIES = host-go libgpgme
-CONTAINERD_BIN_AARCH64_GOPATH = $(@D)/_output
-CONTAINERD_BIN_AARCH64_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=1 \
-	GO111MODULE=off \
-	GOPATH="$(CONTAINERD_BIN_AARCH64_GOPATH)" \
-	GOBIN="$(CONTAINERD_BIN_AARCH64_GOPATH)/bin" \
-	PATH=$(CONTAINERD_BIN_AARCH64_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=arm64
 
-CONTAINERD_BIN_AARCH64_COMPILE_SRC = $(CONTAINERD_BIN_AARCH64_GOPATH)/src/github.com/containerd/containerd
+CONTAINERD_BIN_AARCH64_VERSION = 2.1.4
+CONTAINERD_BIN_AARCH64_SITE = https://github.com/containerd/containerd/releases/download/v$(CONTAINERD_BIN_AARCH64_VERSION)
+CONTAINERD_BIN_AARCH64_SOURCE = containerd-$(CONTAINERD_BIN_AARCH64_VERSION)-linux-arm64.tar.gz
+CONTAINERD_BIN_AARCH64_STRIP_COMPONENTS = 0
 
-define CONTAINERD_BIN_AARCH64_USERS
-	- -1 containerd-admin -1 - - - - -
-	- -1 containerd       -1 - - - - -
-endef
 
 define CONTAINERD_BIN_AARCH64_CONFIGURE_CMDS
-	mkdir -p $(CONTAINERD_BIN_AARCH64_GOPATH)/src/github.com/containerd
 	mkdir -p $(TARGET_DIR)/etc/containerd/containerd.conf.d
-	ln -sf $(@D) $(CONTAINERD_BIN_AARCH64_COMPILE_SRC)
-endef
-
-define CONTAINERD_BIN_AARCH64_BUILD_CMDS
-	PWD=$(CONTAINERD_BIN_AARCH64_COMPILE_SRC) $(CONTAINERD_BIN_AARCH64_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(CONTAINERD_BIN_AARCH64_VERSION) REVISION=$(CONTAINERD_BIN_AARCH64_COMMIT) -C $(@D) binaries
 endef
 
 define CONTAINERD_BIN_AARCH64_INSTALL_TARGET_CMDS
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/containerd \
 		$(TARGET_DIR)/usr/bin
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/containerd-shim \
-		$(TARGET_DIR)/usr/bin
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/containerd-shim-runc-v1 \
-		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/containerd-shim-runc-v2 \
 		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/ctr \
 		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd-stress \
+		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm644 \
 		$(CONTAINERD_BIN_AARCH64_PKGDIR)/config.toml \
 		$(TARGET_DIR)/etc/containerd/config.toml

diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.hash
@@ -1,42 +1,2 @@
-sha256 8565a655345f3db2f7b78b77a2cd3103895229aa44cd0e4c710ba3559e344b5a v1.2.0.tar.gz
-sha256 b92819bde71de947329814a3c649b8adb106cc03be16aae217b94297f4b843a1 v1.2.5.tar.gz
-sha256 f2d578b743fb9faa5b3477b7cf4b33d00501087043a53b27754f14bbe741f891 v1.2.6.tar.gz
-sha256 6165ae2ad669d9ec6d317492d30a1511365bd31ad29efae757f19c1828bf75b3 v1.2.8.tar.gz
-sha256 a0965e1492fca558629826f1aa89a9675de3d451cec67540400b30c0bf6ac387 v1.2.10.tar.gz
-sha256 318886ea1efdec36f088fd6a0a0fe2b2f0ebdfd0066bdb4bd284bad12abc0a41 v1.2.12.tar.gz
-sha256 0811057ab67b78ce911416e793edaeb14b3f1e105d67b8e67b6302e0eab572e4 v1.2.13.tar.gz
-sha256 d30d59e143697aa4f0960205b3f5ac59c573b332f20507740ef2dc0fb5ae8ded v1.3.7.tar.gz
-sha256 9244212589c84b12262769dca6fb985c0c680cb5259c8904b29c511d81fd62d0 v1.3.9.tar.gz
-sha256 bc6d9452c700af0ebc09c0da8ddba55be4c03ac8928e72ca92d98905800c8018 v1.4.3.tar.gz
-sha256 ac62c64664bf62fd44df0891c896eecdb6d93def3438271d7892dca75bc069d1 v1.4.4.tar.gz
-sha256 285a3f4c00a87538bd7d0a82a0a8a758458c02b925349f44f3189f480c326038 v1.4.6.tar.gz
-sha256 3bb9f54be022067847f5930d21ebbfe4e7a67f589d78930aa0ac713492c28bcc v1.4.9.tar.gz
-sha256 85a531725f15e2d136131119d42af4507a5389e0947015152075c4c93816fb5c v1.4.12.tar.gz
-sha256 7507913ba169c103ab67bc51bec31cd977d4348d7bc842da32b7eab5f930a14b v1.5.10.tar.gz
-sha256 02b79d5e2b07b5e64cd28f1fe84395ee11eef95fc49fd923a9ab93022b148be6 v1.5.11.tar.gz
-sha256 f422e21e35705d1e741c1f3280813e43f811eaff4dcc5cdafac8b8952b15f468 v1.6.4.tar.gz
-sha256 27afb673c20d53aa5c31aec07b38eb7e4dc911e7e1f0c76fac9513bbf070bd24 v1.6.6.tar.gz
-sha256 f5f938513c28377f64f85e84f2750d39f26b01262f3a062b7e8ce35b560ca407 v1.6.8.tar.gz
-sha256 a034b2273533207d5d96bef8bd3fce1efff85139815efb756d90c705ae1a05ce v1.6.9.tar.gz
-sha256 ee170fa73b258e448f9b6729440d38c77d19cd9bec46e45cd195d4670cd8b004 v1.6.15.tar.gz
-sha256 e9b84d52da7743000c1e8dae0175dda16d558a44cf80a5ae2556862205361a64 v1.6.18.tar.gz
-sha256 7a90dc72f44e230eb5228ebac23b37e91f7d26d175d563099a8e1c0592047a28 v1.6.19.tar.gz
-sha256 c80b1c7f04057108059fdec9c936fc1ec0dccafa45c00a1d54f14dceb6500552 v1.7.0.tar.gz
-sha256 fd844af82afda7242d8eba5e0086c5a0d54ddc3041c1bbdd4d3c62bfee844e3a v1.7.1.tar.gz
-sha256 68d20562c3164f61f2ec6951edb002bf12cd58b21448e0ab04c5ec56d4dcac43 v1.7.2.tar.gz
-sha256 1fd19d2c75322bdbcb01d190a18d53940a4a79d909bd61a99f9e8e2dbc57a8fe v1.7.3.tar.gz
-sha256 084a62f78f96cb5fda02221425f14df09d3e0acd093e4d4b3527900e3ff94677 v1.7.6.tar.gz
-sha256 4c6042b13746a803766d76b07f756d03678a33a944b52c0b832c238609db1b2e v1.7.7.tar.gz
-sha256 891b84e614b491ab1d3bd5c8f4fb119e4929c24762e149e83e181e72d687f706 v1.7.8.tar.gz
-sha256 e41eba6bb45ea76b85cc8794e4c3b351016e499a36a56b9d43eea66035db42ae v1.7.9.tar.gz
-sha256 dd43e4c1d7b1909a530e044af90697317c64fadbcbdf86fafc607dc723597dbd v1.7.10.tar.gz
-sha256 1f3ca2a15bedcaada4a7c3cde6126fb553226944b599f98bd71d616dfd02861a v1.7.11.tar.gz
-sha256 ae55b25fb04b45dfbbde8280b034783a48ae7c40350d17fd272be5cbf0284cf1 v1.7.14.tar.gz
-sha256 2dc491434b182334b51350f810ed68ace3624c8a2d6e1eac490d93c653498a33 v1.7.15.tar.gz
-sha256 fa16a85b3759a716728c00dda2fff8484b3811f62250724b77d05c115c4522a7 v1.7.17.tar.gz
-sha256 91685cebd50e3f353a402adadf61e2a6aeda3f63754fa0fcc978a043e00acac4 v1.7.18.tar.gz
-sha256 152e23d017b053ee786080ec0410c98aa91967f3aaebdcfaaf4521ac2172ef62 v1.7.19.tar.gz
-sha256 c4268561e514a2e8322bc8cdd39113d5e164fb31c2cef76f479d683395ea9bd6 v1.7.20.tar.gz
-sha256 df6e942e2eeaadd77eda04d7df80fb68bd0dc186a9ab8cb2de25692557158303 v1.7.21.tar.gz
-sha256 8c5edde741b7596af63c021429a1212bd616350ed65a7b741eeffc47e27ee9a9 v1.7.22.tar.gz
-sha256 393bfde8ca1766a0bca3441e18eddc3f5a5c8d97ef676bde0d6c9903e1b0ec0c v1.7.23.tar.gz
+sha256 316d510a0428276d931023f72c09fdff1a6ba81d6cc36f31805fea6a3c88f515  containerd-2.1.4-linux-amd64.tar.gz
+
diff --git a/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk b/deploy/iso/minikube-iso/arch/x86_64/package/containerd-bin/containerd-bin.mk
@@ -1,56 +1,31 @@
 ################################################################################
 #
-# containerd
+# containerd-bin
 #
 ################################################################################
-CONTAINERD_BIN_VERSION = v1.7.23
-CONTAINERD_BIN_COMMIT = 57f17b0a6295a39009d861b89e3b3b87b005ca27
-CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/archive
-CONTAINERD_BIN_SOURCE = $(CONTAINERD_BIN_VERSION).tar.gz
-CONTAINERD_BIN_DEPENDENCIES = host-go libgpgme
-CONTAINERD_BIN_GOPATH = $(@D)/_output
-CONTAINERD_BIN_ENV = \
-	$(GO_TARGET_ENV) \
-	CGO_ENABLED=1 \
-	GO111MODULE=off \
-	GOPATH="$(CONTAINERD_BIN_GOPATH)" \
-	GOBIN="$(CONTAINERD_BIN_GOPATH)/bin" \
-	PATH=$(CONTAINERD_BIN_GOPATH)/bin:$(BR_PATH) \
-	GOARCH=amd64
-
-CONTAINERD_BIN_COMPILE_SRC = $(CONTAINERD_BIN_GOPATH)/src/github.com/containerd/containerd
-
-define CONTAINERD_BIN_USERS
-	- -1 containerd-admin -1 - - - - -
-	- -1 containerd       -1 - - - - -
-endef
+CONTAINERD_BIN_VERSION = 2.1.4
+CONTAINERD_BIN_SITE = https://github.com/containerd/containerd/releases/download/v$(CONTAINERD_BIN_VERSION)
+CONTAINERD_BIN_SOURCE = containerd-$(CONTAINERD_BIN_VERSION)-linux-amd64.tar.gz
+CONTAINERD_BIN_STRIP_COMPONENTS = 0
 
 define CONTAINERD_BIN_CONFIGURE_CMDS
-	mkdir -p $(CONTAINERD_BIN_GOPATH)/src/github.com/containerd
 	mkdir -p $(TARGET_DIR)/etc/containerd/containerd.conf.d
-	ln -sf $(@D) $(CONTAINERD_BIN_COMPILE_SRC)
-endef
-
-define CONTAINERD_BIN_BUILD_CMDS
-	PWD=$(CONTAINERD_BIN_COMPILE_SRC) $(CONTAINERD_BIN_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) VERSION=$(CONTAINERD_BIN_VERSION) REVISION=$(CONTAINERD_BIN_COMMIT) -C $(@D) binaries
 endef
 
 define CONTAINERD_BIN_INSTALL_TARGET_CMDS
+
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/containerd \
 		$(TARGET_DIR)/usr/bin
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/containerd-shim \
-		$(TARGET_DIR)/usr/bin
-	$(INSTALL) -Dm755 \
-		$(@D)/bin/containerd-shim-runc-v1 \
-		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/containerd-shim-runc-v2 \
 		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm755 \
 		$(@D)/bin/ctr \
 		$(TARGET_DIR)/usr/bin
+	$(INSTALL) -Dm755 \
+		$(@D)/bin/containerd-stress \
+		$(TARGET_DIR)/usr/bin
 	$(INSTALL) -Dm644 \
 		$(CONTAINERD_BIN_PKGDIR)/config.toml \
 		$(TARGET_DIR)/etc/containerd/config.toml

diff --git a/pkg/minikube/download/iso.go b/pkg/minikube/download/iso.go
@@ -41,7 +41,7 @@ const fileScheme = "file"
 // DefaultISOURLs returns a list of ISO URL's to consult by default, in priority order
 func DefaultISOURLs() []string {
 	v := version.GetISOVersion()
-	isoBucket := "minikube-builds/iso/21089"
+	isoBucket := "minikube-builds/iso/21368"
 
 	return []string{
 		fmt.Sprintf("https://storage.googleapis.com/%s/minikube-%s-%s.iso", isoBucket, v, runtime.GOARCH),