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

Revert "Merge pull request #22893 from Q-Lee/nanny-heapster" #23499

Closed
wants to merge 2 commits into from

Conversation

mikedanese
Copy link
Member

This reverts commit 1f8773e, reversing
changes made to 9dfbcae.

Reverts #22893. This was a manual revert since #23470 had created some conflicts.

Ref #23470

cc @Q-Lee @fgrzadkowski @piosz @bgrant0607

@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 25, 2016
@bgrant0607
Copy link
Member

LGTM

@bgrant0607 bgrant0607 assigned Q-Lee and unassigned ixdy Mar 25, 2016
@bgrant0607
Copy link
Member

Heapster image was not reverted.

I'll let @Q-Lee take a look, since the revert was partly manual.

@k8s-bot
Copy link

k8s-bot commented Mar 25, 2016

GCE e2e build/test passed for commit b4739b5.

@mikedanese
Copy link
Member Author

Ok beyond the revert, I need to rename the heapster controller names that change in #23470 to play well with get-suffix. See second commit. While the update probably would work, I think it could cause issues with a later update of heapster. cc @piosz

@k8s-bot
Copy link

k8s-bot commented Mar 25, 2016

GCE e2e build/test passed for commit 71614ff.

@k8s-github-robot
Copy link

@mikedanese PR needs rebase

@k8s-github-robot k8s-github-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 30, 2016
@mikedanese mikedanese closed this Mar 30, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. 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.

8 participants