Skip to content

Update containerd to 1.1#36895

Merged
thaJeztah merged 2 commits intomoby:masterfrom
dmcgowan:vendor-containerd-master
Jun 6, 2018
Merged

Update containerd to 1.1#36895
thaJeztah merged 2 commits intomoby:masterfrom
dmcgowan:vendor-containerd-master

Conversation

@dmcgowan
Copy link
Member

@dmcgowan dmcgowan commented Apr 18, 2018 •
edited
Loading

Updates containerd to 1.1. This is pulls in needed updates and client features to complete containerd image store and buildkit integration.

Currently blocked by Swarmkit:
moby/swarmkit#2610
moby/swarmkit#2452
moby/swarmkit#2631
#37059
moby/swarmkit#2649

@dmcgowan dmcgowan requested a review from tianon as a code owner April 18, 2018 22:19
@thaJeztah
Copy link
Member

thaJeztah commented Apr 19, 2018 •
edited
Loading

SwarmKit bump is here: #36905 (just the wrapper update)

@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from 18ef46f to aa619fd Compare April 20, 2018 21:58
@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from aa619fd to ccaf32c Compare May 10, 2018 18:28
@dmcgowan dmcgowan mentioned this pull request May 10, 2018
Merged
@dmcgowan dmcgowan mentioned this pull request May 25, 2018
Merged
@tonistiigi tonistiigi mentioned this pull request May 25, 2018
Merged
@vdemeester
Copy link
Member

vdemeester commented May 25, 2018

@dmcgowan @thaJeztah still blocked (swarmkit PR is merged upstream)

@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from ccaf32c to 24ffa45 Compare May 31, 2018 00:21
@codecov
Copy link

codecov bot commented May 31, 2018 •
edited
Loading

Codecov Report

Merging #36895 into master will decrease coverage by 0.31%.
The diff coverage is 0%.

@@            Coverage Diff             @@
##           master   #36895      +/-   ##
==========================================
- Coverage   34.62%    34.3%   -0.32%     
==========================================
  Files         605      605              
  Lines       44765    44766       +1     
==========================================
- Hits        15499    15359     -140     
- Misses      27166    27342     +176     
+ Partials     2100     2065      -35

@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from 24ffa45 to 8e62d6c Compare May 31, 2018 21:55
@dmcgowan
Copy link
Member Author

dmcgowan commented May 31, 2018

Updated GRPC to 1.12, which forced me to update everything else and vendor SwarmKit to moby/swarmkit#2649

@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from 8e62d6c to c876ffd Compare May 31, 2018 22:25
@dmcgowan dmcgowan requested a review from vdemeester as a code owner May 31, 2018 22:25
@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from 1b570f4 to a3e0df7 Compare June 1, 2018 21:05
@dmcgowan
Copy link
Member Author

dmcgowan commented Jun 2, 2018 •
edited
Loading

Finally green tests, I am going to remove the blocked marker and update swarmkit to the merged version

@dmcgowan dmcgowan changed the title [BLOCKED] Update containerd to 1.1 Update containerd to 1.1 Jun 2, 2018
@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from a3e0df7 to f476ebd Compare June 2, 2018 01:19
@thaJeztah
Copy link
Member

thaJeztah commented Jun 2, 2018

Looks like you need to vendor with an older version of vndr (can do it inside the build container);

The result of vndr differs
01:31:11 
01:31:11  D vendor/golang.org/x/crypto/otr/libotr_test_helper.c
01:31:11  D vendor/golang.org/x/crypto/otr/otr.go
01:31:11  D vendor/golang.org/x/crypto/otr/smp.go
01:31:11 
01:31:11 Please vendor your package with github.com/LK4D4/vndr.

@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from f476ebd to ccb3c3f Compare June 4, 2018 06:38
dmcgowan added 2 commits June 4, 2018 15:37
@dmcgowan
Update containerd to 1.1
52ed3e0 
Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@dmcgowan
Update containerd daemon
a000934 
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@dmcgowan dmcgowan force-pushed the vendor-containerd-master branch from ccb3c3f to a000934 Compare June 4, 2018 22:39
@dmcgowan
Copy link
Member Author

dmcgowan commented Jun 6, 2018

Green now

thaJeztah
thaJeztah approved these changes Jun 6, 2018
View reviewed changes
Copy link
Member

@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.

LGTM

@thaJeztah thaJeztah merged commit fd2f2a9 into moby:master Jun 6, 2018
@vdemeester vdemeester mentioned this pull request Jun 6, 2018
Closed
@alexkreidler alexkreidler mentioned this pull request Jun 7, 2018
Merged
4 tasks
@vdemeester vdemeester mentioned this pull request Jun 8, 2018
Merged
@thaJeztah thaJeztah mentioned this pull request Jul 10, 2018
Open
@thaJeztah
Copy link
Member

thaJeztah commented Oct 30, 2018

Looks like the bump of gRPC caused a regression, because grpc now adds a limit that was not previously set; As of grpc/grpc-go@50d4175 / grpc/grpc-go@6f8b553 (grpc/grpc-go#1165) a limit of 4MB is applied, which can cause issues with many tasks running.

See #38103 and #37997

@thaJeztah thaJeztah mentioned this pull request Oct 31, 2018
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@thaJeztah thaJeztah thaJeztah approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

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

@vdemeester vdemeester Awaiting requested review from vdemeester

Assignees

@runcom runcom

Labels

area/runtime Runtime impact/changelog status/2-code-review

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

6 participants

@dmcgowan @thaJeztah @vdemeester @AkihiroSuda @runcom @GordonTheTurtle