github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #42052 from derekwaynecarr/disable-groups-per-qos

Browse Source 
Automatic merge from submit-queue (batch tested with PRs 41714, 41510, 42052, 41918, 31515)

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

Disable cgroups-per-qos to allow kubemark problems to still be resolved.

Re-enable it once the following merge:
https://github.com/kubernetes/kubernetes/pull/41753
https://github.com/kubernetes/kubernetes/pull/41644
https://github.com/kubernetes/kubernetes/pull/41621

Enabling it before cpu.shares is set on qos tiers can cause regressions since Burstable and BestEffort pods are given equal time.
This commit is contained in:
Kubernetes Submit Queue 2017-02-25 02:17:54 -08:00 committed by GitHub
commit a93904eaa5
1 changed files with 4 additions and 1 deletions
Show Stats 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
}
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 == "" {