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.

Sign up for GitHub

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

Jump to bottom

Cherrypick overlay2 support for docker into v0.25 #1803

Merged
merged 3 commits into from
Nov 15, 2017
Merged

Cherrypick overlay2 support for docker into v0.25 #1803

merged 3 commits into from
Nov 15, 2017

Conversation

dashpole
Copy link
Collaborator

Cherrypicks #1585, which added overlay2 support.
Also cherry-picks #1770, which fixed monitoring an incorrect directory.

bamarni and others added 2 commits November 14, 2017 15:57
@bamarni @dashpole
[docker] add overlay2 storage driver
80728b0 
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
@dashpole
monitor diff directory for overlay2
c61e161
@googlebot
Copy link
Collaborator

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this State. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@zSys-bot
Copy link

Build finished.

1 similar comment
@zSys-bot
Copy link

Build finished.

@dashpole
Copy link
Collaborator Author

consent based on #1585 (comment)

@zSys-bot
Copy link

Build finished.

1 similar comment
@zSys-bot
Copy link

Build finished.

@dashpole dashpole merged commit 2713334 into google:release-v0.25 Nov 15, 2017
@dashpole dashpole deleted the overlay2_support branch November 15, 2017 00:16
@dashpole dashpole mentioned this pull request Nov 15, 2017
Merged
k8s-github-robot pushed a commit to kubernetes/kubernetes that referenced this pull request Nov 17, 2017
Merge pull request #55744 from dashpole/update_cadvisor_v0.25.1
14ea65f 
Automatic merge from submit-queue.

Update cadvisor godeps to v0.25.1

**What this PR does / why we need it**:
Update cAdvisor godeps to v0.25.1.
This adds support for the docker overlay2 storage driver.

**Special notes for your reviewer**:
I cherrypicked two commits which add overlay2 support back to cAdvisor's v0.25 branch, which corresponds to k8s v1.6.  This PR effectively cherrypicks those two PRs: google/cadvisor#1803

**Release note**:
```release-note
Bump cAdvisor to v0.25.1, which adds support for the Docker overlay2 storage driver.
```

/sig node
/kind feature
 cc @dchen1107 @abgworrall @yujuhong
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@dashpole @googlebot @zSys-bot @bamarni