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

Flag gate critical pods annotation support in kubelet #41052

Merged
merged 1 commit into from
Feb 13, 2017

Conversation

vishh
Copy link
Contributor

@vishh vishh commented Feb 7, 2017

If ExperimentalCriticalPodAnnotation=True flag gate is set, kubelet will ensure that pods with `scheduler.alpha.kubernetes.io/critical-pod` annotation will be admitted even under resource pressure, will not be evicted, and are reasonably protected from system OOMs.

For #40573

Signed-off-by: Vishnu kannan <vishnuk@google.com>
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Feb 7, 2017
@vishh vishh requested a review from derekwaynecarr February 7, 2017 01:11
@k8s-reviewable
Copy link

This change is Reviewable

@vishh vishh added release-note Denotes a PR that will be considered when it comes time to generate release notes. cherrypick-candidate labels Feb 7, 2017
@vishh vishh added this to the v1.4 milestone Feb 7, 2017
@k8s-github-robot k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Feb 7, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is NOT APPROVED

The following people have approved this PR: vishh

Needs approval from an approver in each of these OWNERS Files:

We suggest the following people:
cc @dchen1107 @mikedanese
You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

jessfraz added a commit that referenced this pull request Feb 7, 2017
…upstream-release-1.4

Automated cherry pick of #41052
@dchen1107
Copy link
Member

LGTM

@dchen1107 dchen1107 added cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 10, 2017
@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 10, 2017
@jessfraz
Copy link
Contributor

wait this has the 1.4 milestone but its for 1.5 should i cherrypick for 1.4?

@dchen1107 dchen1107 removed the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 10, 2017
@jessfraz
Copy link
Contributor

i think we got it here: #41053

@vishh
Copy link
Contributor Author

vishh commented Feb 10, 2017

A cherrypick has been posted already @jessfraz

@k8s-github-robot k8s-github-robot added the do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. label Feb 10, 2017
@vishh
Copy link
Contributor Author

vishh commented Feb 10, 2017

@saad-ali can we get this merged before the next release?

@dchen1107
Copy link
Member

Wait, this is why I was confused earlier. I thought a cherrypick for 1.4 was done, but then found this one. Also I knew there is one for 1.5, but I couldn't find that one in my review queue. Jess, thanks for pointing out the issue. The milestone was marked wrongly. :-)

@dchen1107 dchen1107 modified the milestones: v1.5, v1.4 Feb 10, 2017
@dchen1107
Copy link
Member

@vishh I fixed the milestone for this pr.

@saad-ali for 1.5.3 patch release.

@vishh
Copy link
Contributor Author

vishh commented Feb 10, 2017

Oops. Sorry for the milestone screw up.

@saad-ali saad-ali added approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Feb 13, 2017
@k8s-ci-robot
Copy link
Contributor

@vishh: The following test(s) failed:

Test name Commit Details Rerun command
Jenkins CRI GCE e2e 3151e6e link @k8s-bot cri e2e test this

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-github-robot
Copy link

Automatic merge from submit-queue

@k8s-github-robot k8s-github-robot merged commit 9b8afb2 into kubernetes:release-1.5 Feb 13, 2017
@k8s-cherrypick-bot
Copy link

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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/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.

8 participants