mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-13 19:36:22 +00:00
67be0a90f4
Automatic merge from submit-queue (batch tested with PRs 61351, 61294). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Fix cpu cfs quota flag with pod cgroups **What this PR does / why we need it**: It fixes the cpu-cfs-quota flag in the kubelet when pod cgroups are enabled. **Which issue(s) this PR fixes** Fixes #61293 **Special notes for your reviewer**: This is a regression reported by some of our users that disable cpu quota enforcement. **Release note**: ```release-note Fix regression where kubelet --cpu-cfs-quota flag did not work when --cgroups-per-qos was enabled ```