Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[19.03 backport] Update containerd to v1.2.9#349

Merged
kolyshkin merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_backport_bump_containerd_1.2.9
Sep 12, 2019
Merged

[19.03 backport] Update containerd to v1.2.9#349
kolyshkin merged 1 commit intodocker-archive:19.03from
thaJeztah:19.03_backport_bump_containerd_1.2.9

Conversation

@thaJeztah
Copy link
Member

@thaJeztah thaJeztah commented Sep 6, 2019 •
edited
Loading

backport of

Update containerd to v1.2.9. https://github.com/containerd/containerd/releases/tag/v1.2.9

The ninth patch release for containerd 1.2 provides a handful of bug fixes and an
update to the gRPC vendored codebase to include 3 CVE fixes provided in the upstream
v1.23.0 release of gRPC. Note that updating gRPC to the current release required small
changes to our core containerd codebase to match the upstream changes since gRPC v1.12.0.
These changes have been backported from containerd's master branch, as well as a
similar small change in ttrpc, requiring that package's vendoring to be updated.

In addition to the gRPC update to include CVE fixes, fixes were made to correct a
container's default Unix environment (introduced in 1.2.8), a small list of CRI plugin
fixes, as well as fixes for registry interactions where Docker-Content-Digest is not
returned (e.g. GitHub Package Registry), and a tar archive modification time bug found
by the buildkit maintainers. A fix to the zfs snapshotter was also included via a
re-vendoring of containerd's zfs import. More notes on these fixes are found below.

@thaJeztah thaJeztah added this to the 19.03.3 milestone Sep 6, 2019
@thaJeztah thaJeztah changed the title 19.03 backport bump containerd 1.2.9 [19.03 backport] Update containerd to v1.2.9 Sep 6, 2019
@thaJeztah thaJeztah changed the title [19.03 backport] Update containerd to v1.2.9 [WIP][19.03 backport] Update containerd to v1.2.9 Sep 6, 2019
@thaJeztah

This comment has been minimized.

Sign in to view
@thaJeztah thaJeztah changed the title [WIP][19.03 backport] Update containerd to v1.2.9 [19.03 backport] Update containerd to v1.2.9 Sep 6, 2019
@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 9, 2019

PowerPC failure, looks like it was caused by Jenkins killing randomly

Screenshot 2019-09-10 at 00 11 36

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 9, 2019

Everything else was green; I'll kick CI one more time to see if we can get green, otherwise I think we should merge

@kolyshkin
Copy link

kolyshkin commented Sep 10, 2019

Is this a new flaky?

[2019-09-09T22:46:49.775Z] --- FAIL: TestServiceRemoveKeepsIngressNetwork (31.95s)
[2019-09-09T22:46:49.775Z] service_test.go:232: Creating a new daemon at: /go/src/github.com/docker/docker/bundles/test-integration/1/TestServiceRemoveKeepsIngressNetwork
[2019-09-09T22:46:49.775Z] daemon.go:321: [dd9ed34db0a08] waiting for daemon to start
[2019-09-09T22:46:49.775Z] daemon.go:339: [dd9ed34db0a08] daemon started
[2019-09-09T22:46:49.775Z] service_test.go:237: timeout hit after 30s: ingress not ready: 0 peers and 0 containers
[2019-09-09T22:46:49.775Z] daemon.go:449: [dd9ed34db0a08] Stopping daemon
[2019-09-09T22:46:49.775Z] daemon.go:288: [dd9ed34db0a08] exiting daemon
[2019-09-09T22:46:49.775Z] daemon.go:436: [dd9ed34db0a08] Daemon stopped

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 10, 2019

No, it's not new; moby#39426. Moby currently skips that test; moby#39453 (and it was just backported to this repository, but not yet in this PR's branch: #350)

@thaJeztah
Copy link
Member Author

thaJeztah commented Sep 10, 2019

The other failure is TestSwarmLockUnlockCluster which is a known flaky test (moby#34051). (perhaps #345 might help a bit, not sure)

@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_containerd_1.2.9 branch from a8df4a6 to 4f229f0 Compare September 12, 2019 08:16
@thaJeztah thaJeztah mentioned this pull request Sep 12, 2019
Merged
@tao12345666333 @thaJeztah
Update containerd to v1.2.9
3d678eb 
Signed-off-by: Jintao Zhang <zhangjintao9020@gmail.com>
(cherry picked from commit 9ef9a33)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah thaJeztah force-pushed the 19.03_backport_bump_containerd_1.2.9 branch from 4f229f0 to 3d678eb Compare September 12, 2019 10:13
kolyshkin
kolyshkin approved these changes Sep 12, 2019
View reviewed changes
Copy link

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM

@kolyshkin kolyshkin merged commit 1176d6f into docker-archive:19.03 Sep 12, 2019
@thaJeztah thaJeztah deleted the 19.03_backport_bump_containerd_1.2.9 branch September 12, 2019 15:25
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

2 more reviewers

@tiborvass tiborvass tiborvass approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

impact/changelog

Projects

None yet

Milestone

19.03.3

Development

Successfully merging this pull request may close these issues.

5 participants

@thaJeztah @kolyshkin @tiborvass @andrewhsu @tao12345666333