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

Remove unnecessary override of /etc/init.d/docker on containervm image. #23593

Merged
merged 1 commit into from
Mar 31, 2016

Conversation

dchen1107
Copy link
Member

This was introduced by #20307 to change docker -d to docker daemon. It should be removed once we upgraded to the new containervm image, but obviously this one fall off the radar.

I believe this one is causing a rare race which makes two docker daemons running on the master node of GKE.

cc/ @cjcullen @jlowdermilk

@k8s-github-robot
Copy link

Labelling this PR as size/L

@k8s-github-robot k8s-github-robot added the size/L Denotes a PR that changes 100-499 lines, ignoring generated files. label Mar 29, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 29, 2016

GCE e2e build/test passed for commit c5ac60f.

@davidopp
Copy link
Member

@zmerlynn

@yujuhong
Copy link
Contributor

Change LGTM since the override was meant to be a temporary solution. However, I am not sure what the race was and how it caused the failure...

@yujuhong yujuhong added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Mar 31, 2016
@dchen1107 dchen1107 added this to the v1.2 milestone Mar 31, 2016
@k8s-github-robot
Copy link

@k8s-bot test this

Tests are more than 48 hours old. Re-running tests.

@a-robinson a-robinson merged commit b60ef6f into kubernetes:master Mar 31, 2016
@bgrant0607
Copy link
Member

Every cherrypick needs a release note.

@bgrant0607 bgrant0607 added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. labels Mar 31, 2016
@k8s-bot
Copy link

k8s-bot commented Mar 31, 2016

GCE e2e build/test passed for commit c5ac60f.

@bgrant0607
Copy link
Member

Please create a cherrypick PR.

bgrant0607 referenced this pull request Mar 31, 2016
…593-upstream-release-1.2

Remove unnecessary override of /etc/init.d/docker on containervm image.
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.2" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

shyamjvs referenced this pull request in shyamjvs/kubernetes Dec 1, 2016
…ick-of-#23593-upstream-release-1.2

Remove unnecessary override of /etc/init.d/docker on containervm image.
shouhong referenced this pull request in shouhong/kubernetes Feb 14, 2017
…ick-of-#23593-upstream-release-1.2

Remove unnecessary override of /etc/init.d/docker on containervm image.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet