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

Trusty: Handle the new var in kube-proxy manifest #24531

Merged
merged 1 commit into from
Apr 20, 2016
Merged

Trusty: Handle the new var in kube-proxy manifest #24531

merged 1 commit into from
Apr 20, 2016

Conversation

andyzheng0831
Copy link

@andyzheng0831 andyzheng0831 commented Apr 20, 2016

This is to capture the kube-proxy manifest change in PR #24429.

@roberthbailey @fabioy @zmerlynn please review this change and mark it as cherry pick candidate. We need to catch up 1.2.3 release.

cc/ @dchen1107 @wonderfly @cjcullen FYI.

I have verified this fix. Without this fix, kube-proxy pod in Trusty nodes cannot be started correctly, i.e., the command line has an unhadled variable. And some other kube-system pods do not work correctly as kube-proxy is not working well. After applying this fix, kube-proxy can be started correctly, and all kube-system pods run successfully.

@k8s-github-robot k8s-github-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. release-note-label-needed labels Apr 20, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 20, 2016

GCE e2e build/test passed for commit 7772b7f.

@cjcullen cjcullen assigned cjcullen and unassigned roberthbailey Apr 20, 2016
@cjcullen cjcullen added this to the v1.2 milestone Apr 20, 2016
@cjcullen cjcullen added release-note-none Denotes a PR that doesn't merit a release note. lgtm "Looks good to me", indicates that a PR is ready to be merged. and removed release-note-label-needed labels Apr 20, 2016
@zmerlynn zmerlynn added the priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. label Apr 20, 2016
@dchen1107
Copy link
Member

LGTM

@k8s-github-robot
Copy link

@k8s-bot test this [submit-queue is verifying that this PR is safe to merge]

@zmerlynn zmerlynn added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Apr 20, 2016
@k8s-bot
Copy link

k8s-bot commented Apr 20, 2016

GCE e2e build/test passed for commit 7772b7f.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 70bfe6a into kubernetes:master Apr 20, 2016
@zmerlynn
Copy link
Member

@andyzheng0831: Please prepare a cherrypick PR ASAP and I'll get it merged, thanks!

@andyzheng0831
Copy link
Author

Cherry pick PR is made #24531

zmerlynn added a commit that referenced this pull request Apr 20, 2016
…-#24531-upstream-release-1.2

Automated cherry pick of #24531
@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 pushed a commit to shyamjvs/kubernetes that referenced this pull request Dec 1, 2016
…ry-pick-of-#24531-upstream-release-1.2

Automated cherry pick of kubernetes#24531
shouhong pushed a commit to shouhong/kubernetes that referenced this pull request Feb 14, 2017
…ry-pick-of-#24531-upstream-release-1.2

Automated cherry pick of kubernetes#24531
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. priority/critical-urgent Highest priority. Must be actively worked on as someone's top priority right now. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants