8000 bump containerd and dependencies to v1.3.0 by thaJeztah · Pull Request #39713 · moby/moby · GitHub
[go: up one dir, main page]
Skip to content

bump containerd and dependencies to v1.3.0 #39713

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Oct 8, 2019
Merged

bump containerd and dependencies to v1.3.0 #39713

merged 8 commits into from
Oct 8, 2019

Conversation

thaJeztah
Copy link
Member
@thaJeztah thaJeztah commented Aug 9, 2019 •
edited
Loading

Update to Containerd v1.3.0

release notes: https://github.com/containerd/containerd/releases/tag/v1.3.0

full diff: containerd/containerd@640860a...v1.3.0

Update to Containerd v1.3.0-beta.2

release notes: https://github.com/containerd/containerd/releases/tag/v1.3.0-beta.2

Update to Containerd v1.3.0-beta.1

release notes: https://github.com/containerd/containerd/releases/tag/v1.3.0-beta.1

@thaJeztah thaJeztah requested a review from tianon as a code owner August 9, 2019 21:44
@thaJeztah

This comment has been minimized.

Sign in to view
thaJeztah
thaJeztah commented Aug 9, 2019
View reviewed changes
@thaJeztah

This comment has been minimized.

Sign in to view
thaJeztah
thaJeztah commented Aug 9, 2019
View reviewed changes
thaJeztah
thaJeztah commented Aug 9, 2019
View reviewed changes
@thaJeztah thaJeztah force-pushed the containerd_1.3 branch 2 times, most recently from 6c54153 to e052af9 Compare August 20, 2019 19:14
@thaJeztah thaJeztah force-pushed the containerd_1.3 branch 2 times, most recently from 048d9a7 to 879cf67 Compare August 26, 2019 12:01
@thaJeztah
Copy link
Member Author
thaJeztah commented Aug 26, 2019 •
edited
Loading

Ah, buildkit needs another update, because one change was reverted/changed in 1.3.0-beta.2;

[2019-08-26T12:10:01.115Z] # github.com/docker/docker/vendor/github.com/moby/buildkit/util/leaseutil
[2019-08-26T12:10:01.116Z] vendor/github.com/moby/buildkit/util/leaseutil/manager.go:33:16: cannot use &local literal (type *local) as type leases.Manager in return argument:
[2019-08-26T12:10:01.116Z] 	*local does not implement leases.Manager (missing AddResource method)

@thaJeztah thaJeztah changed the title [Do not merge] bump containerd and dependencies to v1.3.0-beta.1 [Do not merge] bump containerd and dependencies to v1.3.0-beta.2 Aug 26, 2019
@ehazlett
Copy link
Contributor

Ah, buildkit needs another update, because one change was reverted/changed in 1.3.0-beta.2

thaJeztah#2

@GordonTheTurtle GordonTheTurtle added the dco/no Automatically set by a bot when one of the commits lacks proper signature label Aug 28, 2019
@GordonTheTurtle GordonTheTurtle removed the dco/no Automatically set by a bot when one of the commits lacks proper signature label Aug 28, 2019
@thaJeztah thaJeztah changed the title [Do not merge] bump containerd and dependencies to v1.3.0-beta.2 [Do not merge] bump containerd and dependencies to v1.3.0-rc.0 Sep 6, 2019
@moby moby deleted a comment from GordonTheTurtle Sep 6, 2019
@dmcgowan dmcgowan changed the title [Do not merge] bump containerd and dependencies to v1.3.0-rc.0 bump containerd and dependencies to v1.3.0 Sep 30, 2019
@dmcgowan
Copy link
Member

Pending one change in buildkit before this is ready again

@andrewhsu
Copy link
Contributor

Hmm...I see 5 errors in TestDockerSuite from win-RS5 step:

--- FAIL: TestDockerSuite/TestVolumeFromMixedRWOptions (3.80s)
--- FAIL: TestDockerSuite/TestBuildShCmdJSONEntrypoint (3.28s)
--- FAIL: TestDockerSuite/TestBuildWindowsUser (11.35s)
--- FAIL: TestDockerSuite/TestPostContainersCreateWithStringOrSliceCmd (1.73s)
--- FAIL: TestDockerSuite/TestRunEchoStdout (1.86s)
--- FAIL: TestDockerSuite/TestVolumeFromMixedRWOptions (3.80s)

@dmcgowan
Copy link
Member
dmcgowan commented Oct 3, 2019

@andrewhsu they all have the same message encountered an error during hcsshim::Process::StdioLegacy: failure in a Windows system call: Element not found. Is this something new or related to updating hcshim?

@andrewhsu
Copy link
Contributor

I've only seen it here #39713 (comment)

@dmcgowan
Copy link
Member
dmcgowan commented Oct 3, 2019

Going to try pulling the hcsshim shim commit out for now to see if it still has a breakage while we figure out the source of that error.

dmcgowan and others added 8 commits October 4, 2019 15:05
@dmcgowan
update containerd binary v1.3.0
6c94a50 
full diff: https://github.com/containerd/containerd/compare/v1.2.8..v1.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@dmcgowan
bump containerd v1.3.0
12f9887 
full diff: containerd/containerd@7c1e883...v1.3.0

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@thaJeztah @dmcgowan
bump containerd/go-runc e029b79d8cda8374981c64eba71f28ec38e5526f
1617be9 
- github.com/containerd/go-runc containerd/go-runc@7d11b49...e029b79
  - containerd/go-runc#52 Fix Method of judging command execution failure
    - fixes "init.pid: no such file or directory: unknown" errors
  - containerd/go-runc#54 avoid setting NOTIFY_SOCKET from calling process

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@thaJeztah @dmcgowan
bump containerd/cgroups c4b9ac5c7601384c965b9646fc515884e091ebb9
0af1099 
full diff:  github.com/containerd/cgroups containerd/cgroups@4994991...c4b9ac5

changes included:

  - containerd/cgroups#81 Add network stats
    - addresses containerd/cgroups#80 Add network metrics
  - containerd/cgroups#85 Fix cgroup hugetlb size prefix for kB
    - addresses kubernetes/kubernetes#77169 Permission denied on hugetlb due to wrong filename
    - relates to opencontainers/runc#2065 Fix cgroup hugetlb size prefix for kB
  - containerd/cgroups#88 cgroups: fix MoveTo function fail problem
  - containerd/cgroups#92 fixed an issue with invalid soft memory limits
  - containerd/cgroups#93 avoid adding io_serviced and io_service_bytes duplicately
    - fixes containerd/containerd#3412 collected metric container_blkio_io_serviced_recursive_total: was collected before with the same name and label values

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @dmcgowan
bump containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
56357b7 
full diff: containerd/continuity@aaeac12...f2a389a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@thaJeztah @dmcgowan
bump containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
0b5dcdc 
full diff: containerd/fifo@a9fb20d...bda0ff6

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
@dmcgowan
bump moby/buildkit f7042823e340d38d1746aa675b83d1aca431cee3
bc5484d 
full diff: moby/buildkit@588c73e...f704282

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

fix daemon for changes in containerd registry configuration

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

Update buildernext and daemon for buildkit update

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@thaJeztah @dmcgowan
bump hashicorp/golang-lru v0.5.3
82097c0 
full diff: hashicorp/golang-lru@v0.5.1...v0.5.3

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah
thaJeztah commented Oct 7, 2019
View reviewed changes
Copy link
Member Author
@thaJeztah thaJeztah left a comment

Choose a reason for hiding this comment

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

all green now; LGTM

cpuguy83
cpuguy83 approved these changes Oct 7, 2019
View reviewed changes
Copy link
9E81
Member
@cpuguy83 cpuguy83 left a comment

Choose a reason for hiding this comment

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

LGTM

tiborvass
tiborvass reviewed Oct 7, 2019
View reviewed changes
vendor.conf
github.com/containerd/cgroups 4994991857f9b0ae8dc439551e8bebdbb4bf66c1
github.com/containerd/containerd 36cf5b690dcc00ff0f34ff7799209050c3d0c59a # v1.3.0
github.com/containerd/fifo bda0ff6ed73c67bfb5e62bc9c697f146b7fd7f13
github.com/containerd/continuity f2a389ac0a02ce21c09edd7344677a601970f41c
Copy link
Contributor
@tiborvass tiborvass Oct 7, 2019 •
edited
Loading

Choose a reason for hiding this comment

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

not a big deal, but this should be 75bee3e2ccb6402e3a986ab8bd3b17003fc0fdec (see buildkit's go.mod). The only difference is in fs/copy.go

Copy link
Member Author

Choose a reason for hiding this comment

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

I think I aligned it to https://github.com/containerd/containerd/blob/v1.3.0/vendor.conf#L7, given that this was listed under "containerd" dependencies. I can open a PR in containerd to update it there.

andrewhsu
andrewhsu approved these changes Oct 8, 2019
View reviewed changes
Copy link
Contributor
@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

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

SGTM

this will get to latest containerd that we need for things to be built on top of

@tiborvass tiborvass merged commit b3be280 into moby:master Oct 8, 2019
@thaJeztah thaJeztah deleted the containerd_1.3 branch October 8, 2019 17:45
@thaJeztah thaJeztah mentioned this pull request Oct 25, 2019
Merged
3 tasks
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Oct 25, 2019
@thaJeztah
bump docker/docker to a30990b3c8d0d42280fa501287859e1d2393a951
9E81
a596de8 
full diff: moby/moby@b6684a4...a30990b

relevant changes:

- moby/moby#39995 Update containerd binary to v1.2.10
- moby/moby#40001 Update runc to v1.0.0-rc8-92-g84373aaa (CVE-2019-16884)
- moby/moby#39999 bump golang 1.13.1 (CVE-2019-16276)
- moby/moby#40102 bump golang 1.13.3 (CVE-2019-17596)
- moby/moby#39994 homedir: add cgo or osusergo buildtag constraints for unix.
  This is to ensure that users of the homedir package cannot compile statically
  (`CGO_ENABLED=0`) without also setting the `osusergo` build tag.
- moby/moby#39983 builder: remove legacy build's session handling
  This feature was used by docker build --stream and it was kept experimental.
  Users of this endpoint should enable BuildKit anyway by setting Version to BuilderBuildKit.
    - Related: docker#2105 build: remove --stream (was experimental)
- moby/moby #40045 Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty,
  golang/gddo, gorilla/mux
- moby/moby#39713 bump containerd and dependencies to v1.3.0
- moby/moby#39987 Add ability to handle index acknowledgment with splunk log driver
- moby/moby#40070 Use ocischema package instead of custom handler
    - relates to moby/moby#39727 Docker 19.03 doesn't support OCI image
    - relates to docker/hub-feedback#1871
    - relates to distribution/distribution#3024
- moby/moby#39231 Add support for sending down service Running and Desired task counts
- moby/moby#39822 daemon: Use short libnetwork ID in exec-root

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Oct 26, 2019
@thaJeztah
bump docker/docker to a09e6e323e55e1a9b21df9c2c555f5668df3ac9b
5dc2f59 
full diff: moby/moby@b6684a4...a09e6e3

relevant changes:

- moby/moby#39995 Update containerd binary to v1.2.10
- moby/moby#40001 Update runc to v1.0.0-rc8-92-g84373aaa (CVE-2019-16884)
- moby/moby#39999 bump golang 1.13.1 (CVE-2019-16276)
- moby/moby#40102 bump golang 1.13.3 (CVE-2019-17596)
- moby/moby#40134 Revert "homedir: add cgo or osusergo buildtag constraints for unix"
    - reverts moby/moby#39994 homedir: add cgo or osusergo buildtag constraints for unix,
      in favor of documenting when to set the `osusergo` build tag. The `osusergo`
      build-flag must be used when compiling a static binary with `cgo` enabled,
      and linking against `glibc`.
- moby/moby#39983 builder: remove legacy build's session handling
  This feature was used by docker build --stream and it was kept experimental.
  Users of this endpoint should enable BuildKit anyway by setting Version to BuilderBuildKit.
    - Related: docker#2105 build: remove --stream (was experimental)
- moby/moby #40045 Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty,
  golang/gddo, gorilla/mux
- moby/moby#39713 bump containerd and dependencies to v1.3.0
- moby/moby#39987 Add ability to handle index acknowledgment with splunk log driver
- moby/moby#40070 Use ocischema package instead of custom handler
    - relates to moby/moby#39727 Docker 19.03 doesn't support OCI image
    - relates to docker/hub-feedback#1871
    - relates to distribution/distribution#3024
- moby/moby#39231 Add support for sending down service Running and Desired task counts
- moby/moby#39822 daemon: Use short libnetwork ID in exec-root
- moby/moby#39100 Use Microsoft/hcsshim constants and deprecate pkg/system.GetOsVersion()
    - updates/requires Microsoft/hscshim@2226e083fc390003ae5aa8325c3c92789afa0e7a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
thaJeztah added a commit to thaJeztah/cli that referenced this pull request Oct 26, 2019
@thaJeztah
bump docker/docker to a09e6e323e55e1a9b21df9c2c555f5668df3ac9b
7f6cd64 
full diff: moby/moby@b6684a4...a09e6e3

relevant changes:

- moby/moby#39995 Update containerd binary to v1.2.10
- moby/moby#40001 Update runc to v1.0.0-rc8-92-g84373aaa (CVE-2019-16884)
- moby/moby#39999 bump golang 1.13.1 (CVE-2019-16276)
- moby/moby#40102 bump golang 1.13.3 (CVE-2019-17596)
- moby/moby#40134 Revert "homedir: add cgo or osusergo buildtag constraints for unix"
    - reverts moby/moby#39994 homedir: add cgo or osusergo buildtag constraints for unix,
      in favor of documenting when to set the `osusergo` build tag. The `osusergo`
      build-flag must be used when compiling a static binary with `cgo` enabled,
      and linking against `glibc`.
- moby/moby#39983 builder: remove legacy build's session handling
  This feature was used by docker build --stream and it was kept experimental.
  Users of this endpoint should enable BuildKit anyway by setting Version to BuilderBuildKit.
    - Related: docker#2105 build: remove --stream (was experimental)
- moby/moby #40045 Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty,
  golang/gddo, gorilla/mux
- moby/moby#39713 bump containerd and dependencies to v1.3.0
- moby/moby#39987 Add ability to handle index acknowledgment with splunk log driver
- moby/moby#40070 Use ocischema package instead of custom handler
    - relates to moby/moby#39727 Docker 19.03 doesn't support OCI image
    - relates to docker/hub-feedback#1871
    - relates to distribution/distribution#3024
- moby/moby#39231 Add support for sending down service Running and Desired task counts
- moby/moby#39822 daemon: Use short libnetwork ID in exec-root
- moby/moby#39100 Use Microsoft/hcsshim constants and deprecate pkg/system.GetOsVersion()
    - updates/requires Microsoft/hscshim@2226e083fc390003ae5aa8325c3c92789afa0e7a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
docker-jenkins pushed a commit to docker-archive/docker-ce that referenced this pull request Oct 28, 2019
@thaJeztah
bump docker/docker to a09e6e323e55e1a9b21df9c2c555f5668df3ac9b
ee18946 
full diff: moby/moby@b6684a4...a09e6e3

relevant changes:

- moby/moby#39995 Update containerd binary to v1.2.10
- moby/moby#40001 Update runc to v1.0.0-rc8-92-g84373aaa (CVE-2019-16884)
- moby/moby#39999 bump golang 1.13.1 (CVE-2019-16276)
- moby/moby#40102 bump golang 1.13.3 (CVE-2019-17596)
- moby/moby#40134 Revert "homedir: add cgo or osusergo buildtag constraints for unix"
    - reverts moby/moby#39994 homedir: add cgo or osusergo buildtag constraints for unix,
      in favor of documenting when to set the `osusergo` build tag. The `osusergo`
      build-flag must be used when compiling a static binary with `cgo` enabled,
      and linking against `glibc`.
- moby/moby#39983 builder: remove legacy build's session handling
  This feature was used by docker build --stream and it was kept experimental.
  Users of this endpoint should enable BuildKit anyway by setting Version to BuilderBuildKit.
    - Related: #2105 build: remove --stream (was experimental)
- moby/moby #40045 Bump logrus 1.4.2, go-shellwords, mergo, flock, creack/pty,
  golang/gddo, gorilla/mux
- moby/moby#39713 bump containerd and dependencies to v1.3.0
- moby/moby#39987 Add ability to handle index acknowledgment with splunk log driver
- moby/moby#40070 Use ocischema package instead of custom handler
    - relates to moby/moby#39727 Docker 19.03 doesn't support OCI image
    - relates to docker/hub-feedback#1871
    - relates to distribution/distribution#3024
- moby/moby#39231 Add support for sending down service Running and Desired task counts
- moby/moby#39822 daemon: Use short libnetwork ID in exec-root
- moby/moby#39100 Use Microsoft/hcsshim constants and deprecate pkg/system.GetOsVersion()
    - updates/requires Microsoft/hscshim@2226e083fc390003ae5aa8325c3c92789afa0e7a

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 7f6cd64335dc631efaa8204c01f92aa40939073a
Component: cli
@thaJeztah thaJeztah mentioned this pull request Nov 9, 2019
Closed
@thaJeztah thaJeztah mentioned this pull request Dec 3, 2019
Merged
@thaJeztah thaJeztah mentioned this pull request Jan 24, 2020
Merged
@thaJeztah thaJeztah added this to the 20.03.0 milestone Apr 2, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tonistiigi tonistiigi tonistiigi left review comments

@cpuguy83 cpuguy83 cpuguy83 approved these changes

@tiborvass tiborvass tiborvass approved these changes

@tianon tianon Awaiting requested review from tianon tianon is a code owner

+1 more reviewer

@andrewhsu andrewhsu andrewhsu approved these changes

Reviewers whose approvals may not affect merge requirements
Assignees

@cpuguy83 cpuguy83

Labels
area/runtime Runtime impact/changelog status/2-code-review
Projects
None yet
Milestone
20.10.0
8 participants
@thaJeztah @ehazlett @dmcgowan @andrewhsu @tonistiigi @cpuguy83 @tiborvass @GordonTheTurtle
0