Skip to content

[release/1.2] vendor: bump containerd/cri b1052f3b73fb9f0a6805d3c20e884a4cef265a38#3996

Merged
dmcgowan merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_bump_containerd_cri
Jan 31, 2020
Merged

[release/1.2] vendor: bump containerd/cri b1052f3b73fb9f0a6805d3c20e884a4cef265a38#3996
dmcgowan merged 1 commit intocontainerd:release/1.2from
thaJeztah:1.2_bump_containerd_cri

Conversation

@thaJeztah
Copy link
Copy Markdown
Member

@thaJeztah thaJeztah commented Jan 31, 2020

full diff: containerd/cri@b075cc4...b1052f3

No local changes new dependency needed unfortunately

Copy link
Copy Markdown
Member

@estesp estesp left a comment

Choose a reason for hiding this comment

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

LGTM

…84a4cef265a38

full diff: containerd/cri@b075cc4...b1052f3

- containerd/cri#1389 pick up fix for CVE-2019-19921 in opencontainers/selinux
- containerd/cri#1392 [release/1.2] Sync vendors with containerd 1.2.11

Signed-off-by: Sebastiaan van Stijn <[email protected]>
@thaJeztah
Copy link
Copy Markdown
Member Author

hold on; forgot to stage the new vendor (google.golang.org/appengine); pushing how

@thaJeztah thaJeztah force-pushed the 1.2_bump_containerd_cri branch from 21bdb83 to 9456116 Compare January 31, 2020 15:07
@thaJeztah
Copy link
Copy Markdown
Member Author

@codecov-io
Copy link
Copy Markdown

codecov-io commented Jan 31, 2020

Codecov Report

Merging #3996 into release/1.2 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.2    #3996   +/-   ##
============================================
  Coverage        44.19%   44.19%           
============================================
  Files              100      100           
  Lines            10847    10847           
============================================
  Hits              4794     4794           
  Misses            5313     5313           
  Partials           740      740
Flag Coverage Δ
#linux 47.87% <ø> (ø) ⬆️
#windows 41% <ø> (ø) ⬆️

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 a558638...9456116. Read the comment docs.

Comment thread vendor.conf
golang.org/x/crypto 69ecbb4d6d5dab05e49161c6e77ea40a030884e1
golang.org/x/oauth2 a6bd8cefa1811bd24b86f8902872e4e8225f74c4
golang.org/x/time f51c12702a4d776e4c1fa9b0fabab841babae631
google.golang.org/appengine 54a98f90d1c46b7731eb8fb305d2a321c30ef610 # v1.5.0
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

ok, so it looks to build fine without this dependency

probably because the file has a // +build appengine build-tag (which is not set in our case)

@estesp @Random-Liu wdyt? should we keep it, or remove it?

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Would vndr bring this back in the future if we remove it?

If yes, I think it might be fine to leave it here. :)

@Random-Liu
Copy link
Copy Markdown
Member

LGTM

1 similar comment
@dims
Copy link
Copy Markdown
Member

dims commented Jan 31, 2020

LGTM

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

@dmcgowan dmcgowan merged commit 7018df2 into containerd:release/1.2 Jan 31, 2020
@thaJeztah thaJeztah deleted the 1.2_bump_containerd_cri branch February 1, 2020 06:49
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