Skip to content
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

Update to latest containerd, runc, docker #2158

Merged
merged 3 commits into from
Jun 3, 2022

Conversation

cbgbt
Copy link
Contributor

@cbgbt cbgbt commented May 26, 2022

Issue number: #1971

Description of changes: This moves Bottlerocket to the latest versions of containerd, runc, and docker.

Testing done:
Our own changes are pretty small here, but testing for feature compatibility, performance, and regressions is critical. All testing has been done with a local build of the latest changes to the bottlerocket-sdk.

Terms of contribution:

By submitting this pull request, I agree that this contribution is dual-licensed under the terms of both the Apache License, version 2.0, and the MIT license.

Copy link
Contributor

@bcressey bcressey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM pending testing. I'll also pull these commits into my own development branch to give them more exercise.

We should confirm that ulimit -n in a pod returns 65k. It'd also be good to keep an eye on the runc 1.1.3 milestone to see if any regressions appear. The dbus fix there might be worth pulling in.

@cbgbt
Copy link
Contributor Author

cbgbt commented May 31, 2022

LGTM pending testing. I'll also pull these commits into my own development branch to give them more exercise.

Thanks!

We should confirm that ulimit -n in a pod returns 65k.

I've confirmed that the ulimit is appropriately set inside a kubernetes Pod running in this build of containerd!

It'd also be good to keep an eye on the runc 1.1.3 milestone to see if any regressions appear. The dbus fix there might be worth pulling in.

Good tip. A lot of the existing testing for this build is in-flight, I'll complete it and then look into re-running some subset of testing with a patch for that runc issue in place.

cbgbt added 3 commits June 2, 2022 13:01
This includes a rebase of the rlimit patch.
Includes changes for both docker-engine and docker-cli.
@cbgbt
Copy link
Contributor Author

cbgbt commented Jun 2, 2022

I've moved testing performance impact of this change to #2171, which is also added to the 1.8.0 milestone and is meant to include changes from #2166.

I'm merging in and testing the runc/dbus fix, then this should be ready for review.

@cbgbt
Copy link
Contributor Author

cbgbt commented Jun 2, 2022

It turns out that opencontainers/runc#3476 doesn't totally resolve the issue with dbus.

Our Kubernetes build relies on a vendored version of runc for libct, so we need to also modify that packaging in order to include the fix. This issue is tracked upstream in Kubernetes in kubernetes/kubernetes#100328

I've opened #2172 to track the issue.

@cbgbt cbgbt marked this pull request as ready for review June 2, 2022 19:32
@cbgbt cbgbt merged commit d2e9135 into bottlerocket-os:develop Jun 3, 2022
@cbgbt cbgbt deleted the containerd16 branch August 15, 2023 23:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants