Vendor latest swarmkit, containerd v1.6.1#43357
Merged
thaJeztah merged 3 commits intomoby:masterfrom Mar 11, 2022
Merged
Conversation
32534a3 to
31ee173
Compare
Signed-off-by: Cory Snider <csnider@mirantis.com>
...in preparation for upgrading containerd. Signed-off-by: Cory Snider <csnider@mirantis.com>
Signed-off-by: Cory Snider <csnider@mirantis.com>
6e43f36 to
b36fb04
Compare
AkihiroSuda
approved these changes
Mar 11, 2022
Contributor
|
Afaik you need also update these to make sure that CI works correctly and Line 169 in 38805f2 |
Member
|
There's a separate PR to update the binary; #42942 The containerd library/vendor code is ok to be newer than the binary (due to containerd's v1.x compatibility guarantee at the grpc API level); this also allows upgrading containerd for existing versions of docker engine |
This was referenced Mar 11, 2022
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
- What I did
Upgraded swarmkit to the latest master, and containerd (client library) to v1.6.1. The process was surprisingly painless; could that be an ominous sign?
- How I did it
Other than manually removing replace statements from vendor.mod, I used
go get -modfile vendor.modandgo mod tidy -modfile vendor.mod -compat 1.17to handle all the edits.- How to verify it
CI
- Description for the changelog
@dperny would what enhancements and bugfixes are included in the swarmkit upgrade
- A picture of a cute animal (not mandatory but encouraged)