Merge pull request #76221 from RobertKrawitz/node-pid-limit-beta

Graduate SupportNodePidsLimit to beta
This commit is contained in:
Kubernetes Prow Robot
2019-05-06 15:29:53 -07:00
committed by GitHub
2 changed files with 2 additions and 4 deletions

View File

@@ -29,7 +29,6 @@ import (
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/resource"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/kubernetes/pkg/features"
kubeletconfig "k8s.io/kubernetes/pkg/kubelet/apis/config"
"k8s.io/kubernetes/pkg/kubelet/cm"
"k8s.io/kubernetes/pkg/kubelet/stats/pidlimit"
@@ -40,7 +39,6 @@ import (
)
func setDesiredConfiguration(initialConfig *kubeletconfig.KubeletConfiguration) {
initialConfig.FeatureGates[string(features.SupportNodePidsLimit)] = true
initialConfig.EnforceNodeAllocatable = []string{"pods", kubeReservedCgroup, systemReservedCgroup}
initialConfig.SystemReserved = map[string]string{
string(v1.ResourceCPU): "100m",