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

GCI: fix a breakage in controller-manager #25984

Merged
merged 1 commit into from
May 20, 2016
Merged

GCI: fix a breakage in controller-manager #25984

merged 1 commit into from
May 20, 2016

Conversation

andyzheng0831
Copy link

This PR fixes the breakage to GCI caused by PR #19242.

@andyzheng0831 andyzheng0831 added this to the v1.3 milestone May 20, 2016
@k8s-github-robot k8s-github-robot added size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. release-note-label-needed labels May 20, 2016
@andyzheng0831 andyzheng0831 added release-note-none Denotes a PR that doesn't merit a release note. and removed release-note-label-needed labels May 20, 2016
@mikedanese
Copy link
Member

LGTM

@andyzheng0831
Copy link
Author

I verified this fix by running k8s e2e tests. All passed. Safe to merge. The default ContainerVM-based test will not cover this fix. Mark it as e2e-not-required. Considering the PR breaking GCI is p0, and currently both GCI k8s ci and GKE ci are blocked, prefer to mark this fix as P1

@andyzheng0831 andyzheng0831 added e2e-not-required priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. labels May 20, 2016
@mikedanese mikedanese merged commit 06b9b35 into kubernetes:master May 20, 2016
@andyzheng0831
Copy link
Author

@mikedanese please add a lgtm label so it can be in queue

@andyzheng0831 andyzheng0831 deleted the breakage-fix branch May 20, 2016 19:33
@mikedanese
Copy link
Member

I manually merged

@mikedanese mikedanese added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label May 20, 2016
@k8s-bot
Copy link

k8s-bot commented May 20, 2016

GCE e2e build/test passed for commit 728be28.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm "Looks good to me", indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants