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

Commits on Jan 7, 2017

  1. Kubelet admits critical pods even under memory pressure

    @bprashanth @dchen1107
    bprashanth authored and dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    20ccad2 View commit details
    Browse the repository at this point in the history

  2. Make kube-proxy a critical pod

    @bprashanth @dchen1107
    bprashanth authored and dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    f5b6b17 View commit details
    Browse the repository at this point in the history

  3. Sort critical pods before admission

    @bprashanth @dchen1107
    bprashanth authored and dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    97b6aa0 View commit details
    Browse the repository at this point in the history

  4. assign -998 as the oom_score_adj for critical pods.

    @dchen1107
    dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    d441659 View commit details
    Browse the repository at this point in the history

  5. Fixed an import cycle issue: 

    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
    @dchen1107
    dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    9c7015f View commit details
    Browse the repository at this point in the history

  6. Don't evict static pods

    @bprashanth @dchen1107
    bprashanth authored and dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    07f1799 View commit details
    Browse the repository at this point in the history

  7. Resolve the cherrypick conflict.

    @dchen1107
    dchen1107 committed Jan 7, 2017
    Configuration menu
    Copy the full SHA
    e9ddb4b View commit details
    Browse the repository at this point in the history