Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Conversation

estesp
Copy link
Member

@estesp estesp commented Aug 27, 2019

Includes partial cherry-pick of prior master PR #3192: "bump google.golang.org/grpc v1.20.1"

Required core code changes from master cherry-picked to release/1.2 from the commit
2ed8e60. The vendoring is taken from the recent CVE release of gRPC to 1.23.0 in commit
eb7a6bf (PR #3581).

Signed-off-by: Sebastiaan van Stijn [email protected]
Signed-off-by: Phil Estes [email protected]

@estesp estesp mentioned this pull request Aug 27, 2019
@codecov-io
Copy link

codecov-io commented Aug 27, 2019

Codecov Report

Merging #3586 into release/1.2 will not change coverage.
The diff coverage is 0%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3586   +/-   ##
============================================
  Coverage        44.09%   44.09%           
============================================
  Files              100      100           
  Lines            10790    10790           
============================================
  Hits              4758     4758           
  Misses            5293     5293           
  Partials           739      739
Flag Coverage Δ
#linux 47.76% <0%> (ø) ⬆️
#windows 41.12% <0%> (+0.02%) ⬆️
Impacted Files Coverage Δ
services/server/server.go 1.67% <0%> (ø) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update a4bc1d4...29375ff. Read the comment docs.

@thaJeztah
Copy link
Member

Might want to wait for @stevvooe to have a look; there's doubt if my fix in ttrpc is correct containerd/ttrpc#46 (comment)

@crosbymichael
Copy link
Member

crosbymichael commented Aug 27, 2019

I removed my LGTM and I wanna test this more. I ran into a ttrpc mismatch when updating containerd and i wanna see if old shims can talk to a new containerd with the ttrpc change.

Also, because of this patch. I think we should test the grpc bump a little longer. GRPC changes can be risky and since the contaienrd socket is over a unix socket owned by root, we don't have a huge risk or DoS attack. I guess CRI is a different story.

@thaJeztah
Copy link
Member

Would it be possible to test these scenarios in CI? (mixed version shims/clients/dockerd-versions)?(happy to help)

thaJeztah and others added 2 commits August 28, 2019 14:40
Includes partial cherry-pick of prior master PR:
"bump google.golang.org/grpc v1.20.1"

Code changes from master cherry-picked to release/1.2 for the commit
2ed8e60. The vendoring is taken from
the recent CVE release of gRPC to 1.23.0 in commit
eb7a6bf.

Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Phil Estes <[email protected]>
@estesp
Copy link
Member Author

estesp commented Aug 28, 2019

Just FYI: this PR has been updated with the new ttrpc vendor merged in master in #3592

@crosbymichael
Copy link
Member

LGTM

@estesp estesp added this to the 1.2.9 milestone Sep 4, 2019
Copy link
Member

@dmcgowan dmcgowan left a comment

Choose a reason for hiding this comment

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

LGTM

Copy link
Member

@stevvooe stevvooe left a comment

Choose a reason for hiding this comment

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

LGTM

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

Successfully merging this pull request may close these issues.

6 participants