update containerd to 1.5.5, runc to 1.0.1 #1716
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The logging reduction patch is superseded by an upstream fix: containerd/containerd@1f5b84f27 The relabeling fix is not needed after excluding SELinux attributes when copying files for the volume: containerd/containerd#5104 Signed-off-by: Ben Cressey <bcressey@amazon.com>
Signed-off-by: Ben Cressey <bcressey@amazon.com>
tjkirch
approved these changes
Aug 19, 2021
jpculp
approved these changes
Aug 20, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Issue number:
Fixes #1670
#1674
Description of changes:
Update containerd to 1.5.5. The log reduction patch is no longer needed, and the volume relabeling patch is replaced by what's likely to be the upstream fix.
Update runc to 1.0.1. There's a 1.0.2 release that's coming soon with some fixes we want, but this is still a useful upgrade over
1.0.0-rc95.Testing done:
Verified that a
sonobuoyrun passes for a 1.21 cluster. Confirmed that tasks launch for ECS. No unusual new errors from runc, containerd, or kubelet in the logs.Verified that pods still had the larger number of file descriptors.
Verified that SELinux labeling was still correct.
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.