Update containerd client and dependencies to v1.2.0-rc.1#37710
Update containerd client and dependencies to v1.2.0-rc.1#37710vdemeester merged 2 commits intomoby:masterfrom
Conversation
thaJeztah
added
area/runtime
|
The runc bump apparently breaks docker-in-lxd (proposed fix: opencontainers/runc#1862) // cc @AkihiroSuda |
Ah! Yes, I was actually thinking about that one when vendoring, but didn't check if the PR was merged 😓 |
thaJeztah
force-pushed
the
bump_containerd_1.2.0_beta1
branch
from
8552111 to
cee8919
Compare
Codecov Report
@@ Coverage Diff @@
## master #37710 +/- ##
=========================================
Coverage ? 36.1%
=========================================
Files ? 610
Lines ? 45136
Branches ? 0
=========================================
Hits ? 16298
Misses ? 26603
Partials ? 2235 |
|
Looks like this failure is pretty consistent on all Linux runs; |
thaJeztah
force-pushed
the
bump_containerd_1.2.0_beta1
branch
from
cee8919 to
34c7960
Compare
thaJeztah
changed the title
|
@kolyshkin @AkihiroSuda - rebased this PR, and changed it to only update the vendored (client) code. I'll open a separate PR to update the containerd runtime/daemon and runc version |
|
Ah, hm... build failing (on Windows); thought I tried it, but perhaps before some of these updates; |
thaJeztah
force-pushed
the
bump_containerd_1.2.0_beta1
branch
from
34c7960 to
a560fe2
Compare
There was a problem hiding this comment.
Due to this line, containerd/cri is needed as a dependency. Looking at that code, it's a utility that's only a thin wrapper around code from docker/distribution. Might be good to refactor that and either move it to docker/distribution or copy the utility function;
// NormalizeImageRef normalizes the image reference following the docker convention. This is added
// mainly for backward compatibility.
// The reference returned can only be either tagged or digested. For reference contains both tag
// and digest, the function returns digested reference, e.g. docker.io/library/busybox:latest@
// sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa will be returned as
// docker.io/library/busybox@sha256:7cc4b5aefd1d0cadf8d97d4350462ba51c694ebca145b08d7d41b41acc8db5aa.
func NormalizeImageRef(ref string) (reference.Named, error) {
named, err := reference.ParseNormalizedNamed(ref)
if err != nil {
return nil, err
}
if _, ok := named.(reference.NamedTagged); ok {
if canonical, ok := named.(reference.Canonical); ok {
// The reference is both tagged and digested, only
// return digested.
newNamed, err := reference.WithName(canonical.Name())
if err != nil {
return nil, err
}
newCanonical, err := reference.WithDigest(newNamed, canonical.Digest())
if err != nil {
return nil, err
}
return newCanonical, nil
}
}
return reference.TagNameOnly(named), nil
}There was a problem hiding this comment.
@dmcgowan perhaps there's a utility elsewhere that already does that? ^^
thaJeztah
force-pushed
the
bump_containerd_1.2.0_beta1
branch
from
a560fe2 to
7a132ec
Compare
|
Updating containerd runtime in #37932 |
This updates the containerd dependencies to match the versions used by the vendored containerd version Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Sebastiaan van Stijn <[email protected]>
thaJeztah
force-pushed
the
bump_containerd_1.2.0_beta1
branch
from
7a132ec to
dd622c8
Compare
thaJeztah
changed the title
|
@kolyshkin @AkihiroSuda updated to 1.2.0-rc.1 PTAL |
|
LGTM, thanks @thaJeztah |
|
Are we desiring to merge the RC into master? |
|
@cpuguy83 the current commit that's used is a random commit from master; if you prefer, we can wait for 1.2.0 GA (but updating the dependencies with each bump is a bit cumbersome 😅 ) |
|
either way, runc is still RC 😎 |
|
@cpuguy83 @AkihiroSuda @vdemeester It's green.. good to go? |
|
@thaJeztah Actually, I don't think we want to vendor containerd rc2 in the code. We want master. RC2 is for the binary. |
|
hello everyone, Tried various combinations in version for docker and containerd from the below link But still not successful. In some versions, I get the below error, In some versions, the containers which i try to start from checkpoint does not start and print no logs. As suggested above, I tried to use containerd containerd.io_1.2.0~rc.2-1_arm64.deb could anyone please help! Thanks in advance |
8 participants
Full diffs and included changes:
full diff since rc.0: containerd/containerd@v1.2.0-rc.0...v1.2.0-rc.1
opencontainers/runtime-spec@d810dbc...eba862d
opencontainers/selinux@b29023b...b6fa367
github.com/containerd/continuity containerd/continuity@f44b615...bd77b46
github.com/opencontainers/runc opencontainers/runc@20aff4f...00dc700
github.com/Microsoft/hcsshim microsoft/hcsshim@v0.7.3...v0.7.6
github.com/containerd/ttrpc containerd/ttrpc@94dde38...2a805f7