From 10cd058dea00099b209a22bc49024660b12b5f4f Mon Sep 17 00:00:00 2001 From: pidah Date: Wed, 21 Feb 2018 19:11:00 +0000 Subject: [PATCH] set kubelet defaults for --cgroups-per-qos & --enforce-node-allocatable (#2310) * set kubelet defaults for --cgroups-per-qos & --enforce-node-allocatable * update docs --- docs/clusterdefinition.md | 4 ++-- pkg/acsengine/defaults-kubelet.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/clusterdefinition.md b/docs/clusterdefinition.md index 0ca7df2371..b6602cf9b8 100644 --- a/docs/clusterdefinition.md +++ b/docs/clusterdefinition.md @@ -181,8 +181,8 @@ Below is a list of kubelet options that are *not* currently user-configurable, e |"--pod-manifest-path"|"/etc/kubernetes/manifests"| |"--network-plugin"|"cni"| |"--node-labels"|(based on Azure node metadata)| -|"--cgroups-per-qos"|"false"| -|"--enforce-node-allocatable"|""| +|"--cgroups-per-qos"|"true"| +|"--enforce-node-allocatable"|"pods"| |"--kubeconfig"|"/var/lib/kubelet/kubeconfig"| |"--register-node" (master nodes only)|"true"| |"--register-with-taints" (master nodes only)|"node-role.kubernetes.io/master=true:NoSchedule"| diff --git a/pkg/acsengine/defaults-kubelet.go b/pkg/acsengine/defaults-kubelet.go index d2df9bfdf2..22abe02606 100644 --- a/pkg/acsengine/defaults-kubelet.go +++ b/pkg/acsengine/defaults-kubelet.go @@ -18,8 +18,8 @@ func setKubeletConfig(cs *api.ContainerService) { "--client-ca-file": "/etc/kubernetes/certs/ca.crt", "--pod-manifest-path": "/etc/kubernetes/manifests", "--cluster-dns": o.KubernetesConfig.DNSServiceIP, - "--cgroups-per-qos": "false", - "--enforce-node-allocatable": "", + "--cgroups-per-qos": "true", + "--enforce-node-allocatable": "pods", "--kubeconfig": "/var/lib/kubelet/kubeconfig", "--azure-container-registry-config": "/etc/kubernetes/azure.json", "--keep-terminated-pod-volumes": "false",