Skip to content
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.

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

Update containerd to 1.1 #36895

Merged
merged 2 commits into from
Jun 6, 2018
Merged

Conversation

dmcgowan
Copy link
Member

@dmcgowan dmcgowan commented Apr 18, 2018

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

@thaJeztah
Copy link
Member

thaJeztah commented Apr 19, 2018

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

@vdemeester
Copy link
Member

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

@codecov
Copy link

codecov bot commented May 31, 2018

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
Copy link
Member Author

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

@dmcgowan
Copy link
Member Author

dmcgowan commented Jun 2, 2018

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
@thaJeztah
Copy link
Member

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.

Updates swarmkit, grpc, and all related vendors

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Derek McGowan <derek@mcgstyle.net>
@dmcgowan
Copy link
Member Author

dmcgowan commented Jun 6, 2018

Green now

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
Copy link
Member

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants