kubernetes
/
kops
mirror of https://github.com/kubernetes/kops.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update cgroup hierarchies for k8s 1.6 

We're going with a much cleaner cgroup hierarchy for k8s 1.6
This commit is contained in:
Justin Santa Barbara 2017-02-20 23:30:33 -05:00
parent 58a8e9448a
commit 363cf2a2aa
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pkg/model/components/kubelet.go
View File

@ -119,9 +119,17 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
cloudProvider := fi.CloudProviderID(clusterSpec.CloudProvider)
clusterSpec.Kubelet.CgroupRoot = "/"
if cloudProvider == fi.CloudProviderAWS {
clusterSpec.Kubelet.CloudProvider = "aws"
clusterSpec.Kubelet.CgroupRoot = "docker"
// For 1.6 we're using much cleaner cgroup hierarchies
// but we keep the settings we've tested for k8s 1.5 and lower
// (see https://github.com/kubernetes/kubernetes/pull/41349)
if kubernetesVersion.Major == 1 && kubernetesVersion.Minor <= 5 {
clusterSpec.Kubelet.CgroupRoot = "docker"
}
// Use the hostname from the AWS metadata service
clusterSpec.Kubelet.HostnameOverride = "@aws"
@ -130,11 +138,6 @@ func (b *KubeletOptionsBuilder) BuildOptions(o interface{}) error {
if cloudProvider == fi.CloudProviderGCE {
clusterSpec.Kubelet.CloudProvider = "gce"
clusterSpec.Kubelet.HairpinMode = "promiscuous-bridge"
clusterSpec.Kubelet.RuntimeCgroups = "/docker-daemon"
clusterSpec.Kubelet.KubeletCgroups = "/kubelet"
clusterSpec.Kubelet.SystemCgroups = "/system"
clusterSpec.Kubelet.CgroupRoot = "/"
}
usesKubenet, err := UsesKubenet(clusterSpec)