mirror of
https://github.com/k3s-io/kubernetes.git
synced 2026-01-13 19:36:22 +00:00
f12eda8777
Automatic merge from submit-queue (batch tested with PRs 38419, 38457, 38607) Fix pod level QoS does not works on CRI dockershim Fixes: https://github.com/kubernetes/kubernetes/issues/38458 We did set `CgroupParent ` in `CreateContainer`, but the `HostConfig.Resources` which `CgroupParent` belongs to is override by the following code: ``` hc.CgroupParent = lc.GetCgroupParent() ... hc.Resources = dockercontainer.Resources{ Memory: rOpts.GetMemoryLimitInBytes(), ... } ``` That's why `HostConfig.CgroupParent` is always empty and pod level QoS does not work.