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.

Sign up for GitHub

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

Jump to bottom

Automated cherry pick of #38836 #39114 #39059 upstream release 1.5 #39562

Merged
merged 7 commits into from Jan 10, 2017
Merged

Automated cherry pick of #38836 #39114 #39059 upstream release 1.5 #39562

merged 7 commits into from Jan 10, 2017

Conversation

dchen1107
Copy link
Member

Fixed #38322

Release note:

* Kubelet admits critical pods including kube-proxy even under memory pressure
* Make critical pods have the same oom score as the guaranteed pods
* Stop evicting static pods

bprashanth and others added 6 commits January 6, 2017 17:34
@bprashanth @dchen1107
Kubelet admits critical pods even under memory pressure
20ccad2
@bprashanth @dchen1107
Make kube-proxy a critical pod
f5b6b17
@bprashanth @dchen1107
Sort critical pods before admission
97b6aa0
@dchen1107
assign -998 as the oom_score_adj for critical pods.
d441659
@dchen1107
Fixed an import cycle issue:
9c7015f 
import cycle not allowed in test
package k8s.io/kubernetes/pkg/client/restclient (test)
	imports k8s.io/kubernetes/pkg/api/testapi
	imports k8s.io/kubernetes/pkg/apis/componentconfig/install
	imports k8s.io/kubernetes/pkg/apis/componentconfig/v1alpha1
	imports k8s.io/kubernetes/pkg/kubelet/qos
	imports k8s.io/kubernetes/pkg/kubelet/pod
	imports k8s.io/kubernetes/pkg/client/clientset_generated/clientset
	imports k8s.io/kubernetes/pkg/client/clientset_generated/clientset/typed/apps/v1beta1
	imports k8s.io/kubernetes/pkg/client/restclient
@bprashanth @dchen1107
Don't evict static pods
07f1799
@k8s-ci-robot k8s-ci-robot added the cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. label Jan 7, 2017
@k8s-reviewable
Copy link

This change is Reviewable

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE etcd3 e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot gce etcd3 e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gce e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins GKE smoke e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot cvm gke e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins kops AWS e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot kops aws e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins GCI GCE e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gce e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot gci gke e2e test this. Please help us cut down flakes by linking to an open flake 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 k8s-github-robot added do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note Denotes a PR that will be considered when it comes time to generate release notes. labels Jan 7, 2017
@k8s-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 5cb72118cd7fbb681ad37768c10727347bc8076f. Full PR test history.

The magic incantation to run this job again is @k8s-bot verify test this. Please help us cut down flakes by linking to an open flake 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.

@dchen1107 dchen1107 force-pushed the automated-cherry-pick-of-#38836-#39114-#39059-upstream-release-1.5 branch from 5cb7211 to e3c2f7f Compare January 7, 2017 03:08
@dchen1107 dchen1107 added this to the v1.5 milestone Jan 7, 2017
@k8s-ci-robot
Copy link
Contributor

Jenkins unit/integration failed for commit e3c2f7fa3b3569a91e51771ba681d7d922f5be03. Full PR test history.

The magic incantation to run this job again is @k8s-bot unit test this. Please help us cut down flakes by linking to an open flake 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.

@dchen1107 dchen1107 force-pushed the automated-cherry-pick-of-#38836-#39114-#39059-upstream-release-1.5 branch from e3c2f7f to e9ddb4b Compare January 7, 2017 03:38
@k8s-ci-robot
Copy link
Contributor

Jenkins Kubemark GCE e2e failed for commit e3c2f7fa3b3569a91e51771ba681d7d922f5be03. Full PR test history.

The magic incantation to run this job again is @k8s-bot kubemark e2e test this. Please help us cut down flakes by linking to an open flake 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.

@saad-ali saad-ali added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jan 7, 2017
@saad-ali
Copy link
Member

saad-ali commented Jan 7, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 7, 2017
@saad-ali
Copy link
Member

saad-ali commented Jan 7, 2017

@k8s-bot cri node e2e test this

@saad-ali
Copy link
Member

saad-ali commented Jan 7, 2017

@k8s-bot node e2e test this

@saad-ali
Copy link
Member

saad-ali commented Jan 9, 2017

@k8s-bot cri node e2e test this

@saad-ali
Copy link
Member

saad-ali commented Jan 9, 2017

@k8s-bot node e2e test this

@k8s-ci-robot
Copy link
Contributor

Jenkins CRI GCE Node e2e failed for commit e9ddb4b. Full PR test history.

The magic incantation to run this job again is @k8s-bot cri node e2e test this. Please help us cut down flakes by linking to an open flake 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-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit e9ddb4b. Full PR test history.

The magic incantation to run this job again is @k8s-bot node e2e test this. Please help us cut down flakes by linking to an open flake 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.

@dchen1107
Copy link
Member Author

pr #39630 was merged into 1.5 branch, which should address #39597 for 1.5 node e2e failure above.

@k8s-bot node e2e test this

@dchen1107
Copy link
Member Author

@k8s-bot cri node e2e test this

@saad-ali
Copy link
Member

All checks are green. Manually merging since submit queue is blocked.

All checks have passed
14 successful checks

@saad-ali saad-ali merged commit 2f67f8c into kubernetes:release-1.5 Jan 10, 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
Reviewers
No reviews
Assignees

@saad-ali saad-ali

Labels
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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.5
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@dchen1107 @k8s-reviewable @k8s-ci-robot @saad-ali @k8s-cherrypick-bot @k8s-github-robot @bprashanth