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

Bump runc to d5b4a3eddbe4c890843da971b64f45a0f023f4db #1861

Merged
merged 1 commit into from
Jan 12, 2018

Conversation

vikaschoudhary16
Copy link
Contributor

@vikaschoudhary16 vikaschoudhary16 commented Jan 12, 2018

What this PR does / why we need it:
This fixes a race condition in runc/systemd at container creation time
opencontainers/runc#1683

Special notes for your reviewer:
Needed by kubernetes/kubernetes#58117

Release note:

None

/cc @derekwaynecarr @sjenning @aveshagarwal @vishh @dchen1107 @dashpole @jeremyeder

Signed-off-by: vikaschoudhary16 vichoudh@redhat.com

Signed-off-by: vikaschoudhary16 <vichoudh@redhat.com>
Copy link
Collaborator

@derekwaynecarr derekwaynecarr left a comment

Choose a reason for hiding this comment

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

LGTM

@derekwaynecarr derekwaynecarr merged commit b111f65 into google:master Jan 12, 2018
@dashpole
Copy link
Collaborator

Just a heads up: If you would like to cherrypick this commit to kubernetes 1.9, 1.8, etc, you first need to cherrypick it to the corresponding cadvisor branch: v0.28, v0.27, etc, and then cut releases in each branch, and update the version of cAdvisor that each branch vendors.

If this is just for kubernetes 1.10, then no action is needed, and Ill vendor all cadvisor changes in before 1.10 is cut.

openshift-merge-robot added a commit to openshift/origin that referenced this pull request Jan 15, 2018
Automatic merge from submit-queue (batch tested with PRs 18040, 18097, 18098, 18106, 18087).

UPSTREAM: opencontainers/runc: 1683: Fix race against systemd

Thanks to @vikaschoudhary16 for doing all the legwork upstream on this!

Fixes #16246

opencontainers/runc#1683
google/cadvisor#1861
kubernetes/kubernetes#58117

@derekwaynecarr
k8s-github-robot pushed a commit to kubernetes/kubernetes that referenced this pull request Jan 15, 2018
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Bump runc to d5b4a3e

**What this PR does / why we need it**:
This fixes a race condition in runc/systemd at container creation time
opencontainers/runc#1683

**Special notes for your reviewer**:
Depends on google/cadvisor#1861
`pull-kubernetes-verify` is failing because of this dependency only.


**Release note**:

```release-note
None
```
/sig node
/cc @derekwaynecarr @sjenning @aveshagarwal @vishh @dchen1107 @dashpole @jeremyeder
@vikaschoudhary16 vikaschoudhary16 deleted the bump_runc branch January 16, 2018 06:14
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.

3 participants