Skip to content
This repository has been archived by the owner on Jan 11, 2023. It is now read-only.

set kubelet defaults for --cgroups-per-qos & --enforce-node-allocatable #2310

Merged
merged 2 commits into from
Feb 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/clusterdefinition.md
Original file line number Diff line number Diff line change
Expand Up @@ -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"|
Expand Down
4 changes: 2 additions & 2 deletions pkg/acsengine/defaults-kubelet.go
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down