-
Notifications
You must be signed in to change notification settings - Fork 5.1k
iso: bump to containerd/nerdctl 2.x #21409
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
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
[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.
Approvers can indicate their approval by writing /approve
in a comment
Approvers can cancel approval by writing /approve cancel
in a comment
/ok-to-build-iso
2 similar comments
/ok-to-build-iso
/ok-to-build-iso
deploy/iso/minikube-iso/arch/aarch64/package/containerd-bin-aarch64/containerd-bin.mk
Outdated
Show resolved
Hide resolved
b1b7860
to
5ca83e9
Compare
/ok-to-build-iso
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
/ok-to-build-iso
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
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
Show resolved
Hide resolved
/ok-to-test
This comment has been minimized.
This comment has been minimized.
d56d7f2
to
0d79fb4
Compare
/ok-to-build-iso
/ok-to-build-iso
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
e4af2e4
to
5535fbc
Compare
/ok-to-build-iso
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
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.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
5b0f55a
to
32a5c4b
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
32a5c4b
to
31f1b18
Compare
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
- 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.
For containerd 2.1.4, the recommended nerdctl version is 2.1.3 or higher. Here's why this is the recommended version and where you can find it: - Version alignment: Major releases of containerd are often paired with a corresponding nerdctl release to ensure compatibility with new features and breaking changes. nerdctl 2.1.x is specifically developed and tested for the containerd 2.1.x release cycle. - Release verification: The official nerdctl release page on GitHub explicitly states the intended compatibility. For instance, the release notes for nerdctl 2.1.3 confirm it is expected to be used with containerd 2.1. - Feature support: nerdctl 2.1.x includes updates that support the latest features and architectural changes in containerd 2.1, such as UserNS-Remap mode. (From Google AI Mode) Generated using: make update-nerdctl-version and removing the kicbase change, since nerdctl 2.1.3 does not work with containerd 1.7 consumed from Ubuntu. It will be updated when we switch to newer version of Ubuntu or Debian.
31f1b18
to
2aa028e
Compare
@nirs: The following test failed, say
Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
minikube-pr-bot
commented
Oct 14, 2025
kvm2 driver with docker runtime
┌────────────────┬──────────┬────────────────────────┐
│ COMMAND │ MINIKUBE │ MINIKUBE ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 41.1s │ 43.1s │
│ enable ingress │ 15.9s │ 15.8s │
└────────────────┴──────────┴────────────────────────┘
Times for minikube start: 41.3s 42.0s 41.8s 40.6s 39.9s
Times for minikube (PR 21409) start: 45.1s 40.6s 43.3s 40.7s 45.7s
Times for minikube (PR 21409) ingress: 15.8s 15.8s 15.8s 15.8s 15.8s
Times for minikube ingress: 15.8s 15.8s 15.8s 16.3s 15.8s
docker driver with docker runtime
┌────────────────┬──────────┬────────────────────────┐
│ COMMAND │ MINIKUBE │ MINIKUBE ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 23.4s │ 22.5s │
│ enable ingress │ 11.2s │ 12.4s │
└────────────────┴──────────┴────────────────────────┘
Times for minikube ingress: 10.6s 10.6s 10.6s 11.6s 12.7s
Times for minikube (PR 21409) ingress: 13.6s 13.6s 11.7s 12.6s 10.7s
Times for minikube start: 22.1s 23.6s 22.2s 24.3s 24.9s
Times for minikube (PR 21409) start: 23.4s 22.5s 22.0s 21.9s 22.7s
docker driver with containerd runtime
┌────────────────┬──────────┬────────────────────────┐
│ COMMAND │ MINIKUBE │ MINIKUBE ( PR 21409 ) │
├────────────────┼──────────┼────────────────────────┤
│ minikube start │ 20.9s │ 20.1s │
│ enable ingress │ 20.3s │ 21.1s │
└────────────────┴──────────┴────────────────────────┘
Times for minikube start: 18.8s 20.5s 21.1s 20.7s 23.3s
Times for minikube (PR 21409) start: 21.1s 20.5s 19.4s 18.7s 20.9s
Times for minikube ingress: 20.1s 22.1s 20.1s 19.1s 20.2s
Times for minikube (PR 21409) ingress: 22.1s 20.1s 23.1s 20.1s 20.1s
minikube-pr-bot
commented
Oct 14, 2025
Here are the number of top 10 failed tests in each environments with lowest flake rate.
Besides the following environments also have failed tests: To see the flake rates of all tests by environment, click here. |
Uh oh!
There was an error while loading. Please reload this page.
This is #21368 with the following changes:
Must be merged together with #21643
Fixes #20497