github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disble cgroups-per-qos pending Burstable/cpu.shares being set

Browse Source
This commit is contained in:
Derek Carr
2017-02-24 10:16:41 -05:00
parent 6edd079024
commit 36f4256afd
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/apis/componentconfig/v1alpha1/defaults.go
View File

@@ -392,7 +392,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.IPTablesDropBit = &temp obj.IPTablesDropBit = &temp
} }
if obj.CgroupsPerQOS == nil { if obj.CgroupsPerQOS == nil {
temp := true // disabled pending merge of https://github.com/kubernetes/kubernetes/pull/41753
// as enabling the new hierarchy without setting /Burstable/cpu.shares may cause
// regression.
temp := false
obj.CgroupsPerQOS = &temp obj.CgroupsPerQOS = &temp
} }
if obj.CgroupDriver == "" { if obj.CgroupDriver == "" {