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

This commit is contained in:
Derek Carr 2017-02-24 10:16:41 -05:00
parent 6edd079024
commit 36f4256afd

View File

@ -392,7 +392,10 @@ func SetDefaults_KubeletConfiguration(obj *KubeletConfiguration) {
obj.IPTablesDropBit = &temp
}
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
}
if obj.CgroupDriver == "" {