Sync manifests with kubeadm (#3383)

This commit is contained in:
Andreas Krüger
2018-09-24 11:17:18 +02:00
committed by k8s-ci-robot
parent 02de35cfc3
commit d6ebe8c3e7
5 changed files with 8 additions and 1 deletions

View File

@@ -61,6 +61,7 @@ kube_controller_cpu_requests: 100m
kube_controller_node_monitor_grace_period: 40s
kube_controller_node_monitor_period: 5s
kube_controller_pod_eviction_timeout: 5m0s
kube_controller_terminated_pod_gc_threshold: 12500
kube_scheduler_memory_limit: 512M
kube_scheduler_cpu_limit: 250m
kube_scheduler_memory_requests: 170M
@@ -69,6 +70,7 @@ kube_apiserver_memory_limit: 2000M
kube_apiserver_cpu_limit: 800m
kube_apiserver_memory_requests: 256M
kube_apiserver_cpu_requests: 100m
kube_apiserver_request_timeout: "1m0s"
# 1.9 and below Admission control plug-ins
kube_apiserver_admission_control: