Skip to content

[release/1.3 backport] Bump to opencontainers/runc new version - v1.0.0-rc10#3976

Merged
estesp merged 1 commit intocontainerd:release/1.3from
dims:update-to-new-rc10-of-opencontainers/runc-release-1.3
Jan 25, 2020
Merged

[release/1.3 backport] Bump to opencontainers/runc new version - v1.0.0-rc10#3976
estesp merged 1 commit intocontainerd:release/1.3from
dims:update-to-new-rc10-of-opencontainers/runc-release-1.3

Conversation

@dims
Copy link
Copy Markdown
Member

@dims dims commented Jan 25, 2020

We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-16884 as well. The full
diff upstream is here:
opencontainers/runc@v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jan 25, 2020

Build succeeded.

@thaJeztah
Copy link
Copy Markdown
Member

was this a cherry pick of the commit on master? If so, could you use the -x option so that there's a reference to the original commit?

git cherry-pick -s -x <commit>

(also, for backports to release branches; perhaps you can update the title (on github, not the commit message) to have [release/1.3 backport] as prefix (see, eg #3961) it makes it easier to find back PRs that were backported

We have a new release of runc ( opencontainers/runc#2217 ). This release
has a fix for a race condition we are struggling with in kubernetes
(especially CI jobs) which was fixed in opencontainers/runc#2185

The v1.0.0-rc10 includes the fix for CVE-2019-19921 as well. The full
diff upstream is here:
opencontainers/runc@v1.0.0-rc9...v1.0.0-rc10

Signed-off-by: Davanum Srinivas <davanum@gmail.com>
(cherry picked from commit 923c05b)
Signed-off-by: Davanum Srinivas <davanum@gmail.com>
@dims dims force-pushed the update-to-new-rc10-of-opencontainers/runc-release-1.3 branch from 2f85c66 to 0db3c9b Compare January 25, 2020 01:28
@dims dims changed the title Bump to opencontainers/runc new version - v1.0.0-rc10 [release/1.3 backport] Bump to opencontainers/runc new version - v1.0.0-rc10 Jan 25, 2020
@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 25, 2020

@thaJeztah thanks a lot for all your guidance, i've fixed up both 1.2 and 1.3 backports with what you suggested.

@theopenlab-ci
Copy link
Copy Markdown

theopenlab-ci bot commented Jan 25, 2020

Build succeeded.

@codecov-io
Copy link
Copy Markdown

Codecov Report

Merging #3976 into release/1.3 will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff              @@
##           release/1.3    #3976   +/-   ##
============================================
  Coverage        42.31%   42.31%           
============================================
  Files              129      129           
  Lines            14341    14341           
============================================
  Hits              6069     6069           
  Misses            7373     7373           
  Partials           899      899
Flag Coverage Δ
#linux 45.83% <ø> (ø) ⬆️
#windows 37.31% <ø> (ø) ⬆️

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 a375ee0...0db3c9b. Read the comment docs.

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

Thanks for going the extra mile; perhaps these things (/conventions) should be written up somewhere if they aren't.

@dims
Copy link
Copy Markdown
Member Author

dims commented Jan 25, 2020

@thaJeztah yep, will try to do that once i get a round of these changes in

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

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

@estesp estesp merged commit da15d82 into containerd:release/1.3 Jan 25, 2020
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.

5 participants