Update containerd to 1.2x #38168
Merged
Update containerd to 1.2x #38168
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
crosbymichael
force-pushed
the
ctd12
branch
2 times, most recently
from
91d0cfa to
8efe278
Compare
Codecov Report
@@ Coverage Diff @@
## master #38168 +/- ##
==========================================
- Coverage 36.12% 36.1% -0.02%
==========================================
Files 610 610
Lines 45234 45234
==========================================
- Hits 16339 16332 -7
- Misses 26657 26661 +4
- Partials 2238 2241 +3 |
|
It's 💚 |
|
needs a rebase now; I just rebased #38062, so if you rebase on top of that one, it should work. #38128 was merged earlier today, so the runc changes are now limited to just these; opencontainers/runc@9f1e944...079817c (so may not be needed to fix the issue) |
crosbymichael
changed the title
thaJeztah
reviewed
Nov 14, 2018
release notes: https://github.com/containerd/containerd/releases/tag/v1.2.0 - New V2 Runtime with a stable gRPC interface for managing containers through external shims. - Updated CRI Plugin, validated against Kubernetes v1.11 and v1.12, but it is also compatible with Kubernetes v1.10. - Support for Kubernetes Runtime Class, introduced in Kubernetes 1.12 - A new proxy plugin configuration has been added to allow external snapshotters be connected to containerd using gRPC.- - A new Install method on the containerd client allows users to publish host level binaries using standard container build tooling and container distribution tooling to download containerd related binaries on their systems. - Add support for cleaning up leases and content ingests to garbage collections. - Improved multi-arch image support using more precise matching and ranking - Added a runtime `options` field for shim v2 runtime. Use the `options` field to config runtime specific options, e.g. `NoPivotRoot` and `SystemdCgroup` for runtime type `io.containerd.runc.v1`. - Some Minor API additions - Add `ListStream` method to containers API. This allows listing a larger number of containers without hitting message size limts. - Add `Sync` flag to `Delete` in leases API. Setting this option will ensure a garbage collection completes before the removal call is returned. This can be used to guarantee unreferenced objects are removed from disk after a lease. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
|
@thaJeztah can we get reviews and merged now? |
thaJeztah
approved these changes
Nov 20, 2018
| @@ -4,7 +4,7 @@ | |||
| # containerd is also pinned in vendor.conf. When updating the binary | |||
| # version you may also need to update the vendor version to pick up bug | |||
| # fixes or new APIs. | |||
| CONTAINERD_COMMIT=9f2e07b1fc1342d1c48fe4d7bbb94cb6d1bf278b # v1.1.4 | |||
| CONTAINERD_COMMIT=aa537a67b3a9026c423a63dbaf71e4cc0776b2ad # v1.2.0-13-g8afcade1 | |||
There was a problem hiding this comment.
may want to remove the # v1.2.0-13-g8afcade1 comment, because it no longer matches 😅
There was a problem hiding this comment.
another pr, i don't know why anyone would add a comment anyways, its just asking for trouble
There was a problem hiding this comment.
Mainly because the version is pinned on a commit (related to #37968), which makes it difficult to see what version of containerd is being used.
| @@ -118,7 +118,7 @@ github.com/googleapis/gax-go v2.0.0 | |||
| google.golang.org/genproto 694d95ba50e67b2e363f3483057db5d4910c18f9 | |||
|
|
|||
| # containerd | |||
| github.com/containerd/containerd c4446665cb9c30056f4998ed953e6d4ff22c7c39 # v1.2.0 | |||
| github.com/containerd/containerd aa537a67b3a9026c423a63dbaf71e4cc0776b2ad # v1.2.0 | |||
|
ping @vdemeester @cpuguy83 PTAL |
This was referenced Nov 20, 2018
6 tasks
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.
obsoletes #38062 (all commits of that PR are included in this PR)
runc diff; opencontainers/runc@9f1e944...10d38b6