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

Fixing heapster memory requirements. #26109

Merged
merged 1 commit into from
May 24, 2016
Merged

Conversation

Q-Lee
Copy link
Contributor

@Q-Lee Q-Lee commented May 23, 2016

Analytics

@k8s-github-robot k8s-github-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note-label-needed labels May 23, 2016
@Q-Lee
Copy link
Contributor Author

Q-Lee commented May 23, 2016

@zmerlynn - this fixes the heapster memory usage bug you found

@zmerlynn zmerlynn added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed release-note-label-needed labels May 23, 2016
@Q-Lee Q-Lee assigned zmerlynn and unassigned eparis May 24, 2016
@zmerlynn zmerlynn added 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. labels May 24, 2016
@k8s-bot
Copy link

k8s-bot commented May 24, 2016

GCE e2e build/test passed for commit 81ee3e2.

@davidopp
Copy link
Member

cc/ @vishh @fgrzadkowski @mwielgus @piosz

@wojtek-t wojtek-t added this to the v1.3 milestone May 24, 2016
@wojtek-t
Copy link
Member

Thanks for the fix @Q-Lee

I'm oncall today so I'm manually merging it to unblock some tests.

@wojtek-t wojtek-t merged commit 307767e into kubernetes:master May 24, 2016
@andyzheng0831
Copy link

@roberthbailey @Q-Lee @wojtek-t @zmerlynn please fix the breakage to GCI (in cluster/gce/gci/configure-helper.sh). Adding, removing, or renaming a variable in kube-system manifest requires according changes in cluster/gce/gci/configure-helper.sh. Both GCE and GKE CI tests capture the breakage after this PR was merged

@wojtek-t
Copy link
Member

@andyzheng0831 - sorry for the problem. Looking now.

wojtek-t added a commit to wojtek-t/kubernetes that referenced this pull request May 24, 2016
wojtek-t added a commit that referenced this pull request May 24, 2016
@wojtek-t
Copy link
Member

#26159 should hopefully fix the problem

@wojtek-t
Copy link
Member

Yeah - seems to be fixed now.

k8s-github-robot pushed a commit that referenced this pull request Jun 1, 2016
Automatic merge from submit-queue

Trusty: fix breakage by #26413 and #26109

The code https://github.com/kubernetes/kubernetes/tree/master/cluster/gce/trusty in both master and release-1.2 branches is broken. Although we already switched to using cluster/gce/gci for 1.3 branch, we will still need to maintain the cluster/gce/trusty code as long as release-1.2 branch is not deprecated. I will make a couple of PR and cherry-picks to make cluster/gce/trusty back to normal. This PR is one of them, which will not be cherry picked to release-1.2.

@roberthbailey @dchen1107 @fabioy @zmerlynn 

cc/ @kubernetes/goog-image
mtaufen pushed a commit to mtaufen/kubernetes that referenced this pull request Jun 6, 2016
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 Denotes a PR that will be considered when it comes time to generate release notes. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants