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.4 #39563

Merged
merged 7 commits into from
Jan 11, 2017
Merged

Automated cherry pick of #38836 #39114 #39059 upstream release 1.4 #39563

merged 7 commits into from
Jan 11, 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 18:15
@bprashanth @dchen1107
Kubelet admits critical pods even under memory pressure
3a01539
@bprashanth @dchen1107
Make kube-proxy a critical pod
a6a634f
@bprashanth @dchen1107
Sort critical pods before admission
3771e15
@dchen1107
assign -998 as the oom_score_adj for critical pods.
e44d60c
@dchen1107
Fixed an import cycle issue:
952084b 
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
e03645e
@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-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
@jessfraz jessfraz added this to the v1.4 milestone Jan 7, 2017
@jessfraz jessfraz added cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cherrypick-candidate and removed do-not-merge DEPRECATED. Indicates that a PR should not merge. Label can only be manually applied/removed. labels Jan 7, 2017
@dchen1107 dchen1107 force-pushed the automated-cherry-pick-of-#38836-#39114-#39059-upstream-release-1.4 branch 3 times, most recently from 165cefe to c0d02ae Compare January 9, 2017 19:20
@jessfraz
Copy link
Contributor

jessfraz commented Jan 9, 2017

I think there were some problems with the cherry-pick I can look into them if you dont have time

@jessfraz
Copy link
Contributor

jessfraz commented Jan 9, 2017

never mind just saw the new commit :)

@dchen1107
Copy link
Member Author

@jessfraz Sorry for another push. It requires a lot of manual effort to resolve those conflicts. :-(

@jessfraz
Copy link
Contributor

jessfraz commented Jan 9, 2017

no worries thanks for taking the time!

@jessfraz jessfraz added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 9, 2017
@dchen1107
Copy link
Member Author

node e2e issue is caused by dockerized node e2e (#39597).

@jessfraz
Copy link
Contributor

merged #39632 so this should pass now

@jessfraz
Copy link
Contributor

@k8s-bot test this please

@jessfraz
Copy link
Contributor

@k8s-bot cvm gce e2e test this

@jessfraz
Copy link
Contributor

@k8s-bot verify test this

@dchen1107 dchen1107 force-pushed the automated-cherry-pick-of-#38836-#39114-#39059-upstream-release-1.4 branch from c0d02ae to 290bfb9 Compare January 10, 2017 01:40
@k8s-github-robot
Copy link

/lgtm cancel //PR changed after LGTM, removing LGTM. @dchen1107 @jessfraz

@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 10, 2017
@dchen1107
Copy link
Member Author

#39632 was merged which should fix dockerized node-e2e test.

@jessfraz
Copy link
Contributor

@k8s-bot test this please

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE Node e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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 unit/integration failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCE etcd3 e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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 GCI GCE e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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 GKE smoke e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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 Kubemark GCE e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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.

@k8s-ci-robot
Copy link
Contributor

Jenkins GCI GKE smoke e2e failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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-ci-robot
Copy link
Contributor

Jenkins verification failed for commit 290bfb96ee12592685ef8b5fc20da6e766bde2b3. 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.4 branch from 290bfb9 to d7e396c Compare January 11, 2017 00:38
@jessfraz
Copy link
Contributor

all green merging

@jessfraz jessfraz merged commit 64dcab3 into kubernetes:release-1.4 Jan 11, 2017
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.4" 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

@jessfraz jessfraz

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. 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.4
Development

Successfully merging this pull request may close these issues.
7 participants
@dchen1107 @k8s-reviewable @jessfraz @k8s-github-robot @k8s-ci-robot @k8s-cherrypick-bot @bprashanth