ISO: bump to containerd 2 #21409

nirs · 2025-08-24T12:06:05Z

This is #21368 with the following changes:

Rebase on master
Fix whitespace in hash files
Unify containerd-bin makefiles
Update contained-bin Config.in
Remove containerd.conf.d directory
Add missing _AARCH64 to variable names

Status:

Need testing agin after reverting the config.toml change.

Fixes #20497

k8s-ci-robot · 2025-08-24T12:06:07Z

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

k8s-ci-robot · 2025-08-24T12:06:11Z

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: nirs
Once this PR has been reviewed and has the lgtm label, please assign spowelljr for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

OWNERS

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

nirs · 2025-08-24T12:06:26Z

/ok-to-build-iso

nirs · 2025-08-24T13:42:28Z

/ok-to-build-iso

nirs · 2025-08-24T17:10:13Z

/ok-to-build-iso

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk

nirs · 2025-08-24T17:26:42Z

/ok-to-build-iso

medyagh · 2025-08-25T18:28:18Z

See the logs at:
https://storage.googleapis.com/minikube-builds/logs/21409/5ca83e9/iso_build.txt

for example for this PR
https://storage.googleapis.com/minikube-builds/logs/20669/22ed44e/iso_build.txt

5ca83e9

medyagh · 2025-08-25T18:37:54Z

/ok-to-build-iso

minikube-bot · 2025-08-25T23:05:41Z

Hi @nirs, we have updated your PR with the reference to newly built ISO. Pull the changes locally if you want to test with them or update your PR further.

nirs

The config.toml does not help with #21408 and may break code configuring containerd using sed(!?). We need to replace the configuration code with proper toml parsing but for now we can keep the existing config.

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk

medyagh · 2025-08-28T18:39:13Z

/ok-to-test

minikube-pr-bot · 2025-08-28T19:52:58Z

kvm2 driver with docker runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 48.8s    │ 51.0s                  │
│ enable ingress │ 16.7s    │ 16.3s                  │
└────────────────┴──────────┴────────────────────────┘

Times for minikube start: 47.5s 48.8s 47.3s 51.1s 49.4s
Times for minikube (PR 21409) start: 48.6s 51.2s 50.9s 52.1s 52.3s

Times for minikube ingress: 18.9s 15.9s 15.9s 15.9s 16.9s
Times for minikube (PR 21409) ingress: 17.0s 16.0s 16.9s 15.9s 15.9s

docker driver with docker runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 24.9s    │ 26.0s                  │
│ enable ingress │ 13.6s    │ 14.4s                  │
└────────────────┴──────────┴────────────────────────┘

Times for minikube start: 25.4s 23.9s 27.4s 24.1s 23.7s
Times for minikube (PR 21409) start: 25.0s 28.0s 23.2s 26.4s 27.4s

Times for minikube ingress: 13.7s 13.6s 13.6s 13.7s 13.6s
Times for minikube (PR 21409) ingress: 13.2s 13.6s 13.7s 17.7s 13.7s

docker driver with containerd runtime

┌────────────────┬──────────┬────────────────────────┐
│    COMMAND     │ MINIKUBE │ MINIKUBE  ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 24.6s    │ 23.1s                  │
│ enable ingress │ 31.2s    │ 28.2s                  │
└────────────────┴──────────┴────────────────────────┘

Times for minikube start: 22.2s 22.7s 24.8s 27.5s 26.0s
Times for minikube (PR 21409) start: 21.7s 23.2s 23.8s 22.9s 23.7s

Times for minikube (PR 21409) ingress: 39.6s 23.7s 23.6s 30.6s 23.7s
Times for minikube ingress: 24.1s 39.7s 40.1s 23.6s 28.7s

- Fix Makefile title in aarch64 - Unify whitespaec in *.mk files - Remove extra space between the hash and the tarball name - Remove empty line at the end hash file

Based on crictl-bin Config.in.

Containerd supports a simple and poorly documented drop-in configuration files using the imports option. If this option is set: imports = ["/etc/containerd/conf.d/*.toml"] Then toml files under /etc/containerd/conf.d/ are loaded and merged with the config read from /etc/containerd/config.toml. Unlike systemd drop-in files, you cannot override single option by adding drop-in configuration file. To override a single option you must set all options in the section, and the entire section is replaced by the drop-in file. We never used this feature since our config contains: # imports And we don't configure this dynamically. Our config on the host is: $ grep conf.d /etc/containerd/config.toml conf_dir = "/etc/cni/net.d" However we were creating: /etc/containerd/containerd.conf.d/ This path does not make sense (repeating containerd twice) and files in this directory are ignored. Finally this directory was created in CONFIGURE_CMDS instead of INSTALL_CMDS. Now that we install a binary we should not have any configure commands. Since we never had a working conf.d directory we can safely remove it.

This is the reason for the strange failure when build the x86_64 iso, about no hash for arm64 tarball. I seems that package for different architectures must have a different names to avoid confusing buildroot. The name was broken by mistake when updating to containerd 2.1.4. With this change iso build works for both aarch64 and x86_64.

nirs · 2025-08-31T21:52:34Z

/ok-to-build-iso

nirs · 2025-08-31T22:05:31Z

Change sin latest version:

rebase on master
squash whitespace commits
remove the config.toml change since it may break changes applied in generateContainerdConfig()
- we can consider the config again when we have a better configuration mechanism that does not depend on the config content.
Improve the commit messages

Need testing again since last time I test mostly with the new config.

minikube-bot · 2025-09-01T01:07:35Z

Hi @nirs, we have updated your PR with the reference to newly built ISO. Pull the changes locally if you want to test with them or update your PR further.

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2025

k8s-ci-robot requested a review from ComradeProgrammer August 24, 2025 12:06

k8s-ci-robot requested a review from prezha August 24, 2025 12:06

k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Aug 24, 2025

nirs commented Aug 24, 2025

View reviewed changes

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk Outdated Show resolved Hide resolved

nirs force-pushed the containerd2 branch from b1b7860 to 5ca83e9 Compare August 24, 2025 17:25

nirs marked this pull request as ready for review August 24, 2025 19:06

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 24, 2025

k8s-ci-robot requested a review from medyagh August 24, 2025 19:06

nirs mentioned this pull request Aug 24, 2025

containerd: preloaded images fail to save #21408

Open

nirs marked this pull request as draft August 26, 2025 21:56

k8s-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 26, 2025

nirs commented Aug 26, 2025

View reviewed changes

deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk Show resolved Hide resolved

k8s-ci-robot added the ok-to-test Indicates a non-member PR verified by an org member that is safe to test. label Aug 28, 2025

ComradeProgrammer and others added 3 commits August 31, 2025 23:20

update to containerd 2.1.4

3f34dc5

iso: Unify containerd-bin whitespace

c95b3a7

- Fix Makefile title in aarch64 - Unify whitespaec in *.mk files - Remove extra space between the hash and the tarball name - Remove empty line at the end hash file

iso: Update contained-bin Config.in

deda56b

Based on crictl-bin Config.in.

nirs force-pushed the containerd2 branch from 024eb9f to d56d7f2 Compare August 31, 2025 20:26

nirs added 2 commits September 1, 2025 00:36

nirs force-pushed the containerd2 branch from d56d7f2 to 0d79fb4 Compare August 31, 2025 21:49

nirs marked this pull request as ready for review August 31, 2025 21:54

k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Aug 31, 2025

Updating ISO to v1.36.0-1756677621-21409

225141d

ISO: bump to containerd 2 #21409

Are you sure you want to change the base?

ISO: bump to containerd 2 #21409

Conversation

nirs commented Aug 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

k8s-ci-robot commented Aug 24, 2025

Uh oh!

k8s-ci-robot commented Aug 24, 2025

Uh oh!

nirs commented Aug 24, 2025

Uh oh!

nirs commented Aug 24, 2025

Uh oh!

nirs commented Aug 24, 2025

Uh oh!

Uh oh!

nirs commented Aug 24, 2025

Uh oh!

medyagh commented Aug 25, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

medyagh commented Aug 25, 2025

Uh oh!

minikube-bot commented Aug 25, 2025

Uh oh!

nirs left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

medyagh commented Aug 28, 2025

Uh oh!

minikube-pr-bot commented Aug 28, 2025

Uh oh!

nirs commented Aug 31, 2025

Uh oh!

nirs commented Aug 31, 2025

Uh oh!

minikube-bot commented Sep 1, 2025

Uh oh!

Uh oh!

nirs commented Aug 24, 2025 •

edited

Loading

medyagh commented Aug 25, 2025 •

edited

Loading