github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-07-17 02:06:23 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into release-1.36

Browse Source
This commit is contained in:
Kubernetes Release Robot
2026-04-17 08:26:51 +00:00
parent 1729637f0c 03779bbd00
commit b139cc7960
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
pkg/kubelet/cm/qos_container_manager_linux.go
View File

@@ -353,9 +353,9 @@ func (m *qosContainerManagerImpl) UpdateCgroups(logger logr.Logger) error {
return err
}
// Update cgroup v2 memory.min settings. Called regardless of the MemoryQoS
// feature gate to clear stale values when the feature is disabled.
if libcontainercgroups.IsCgroup2UnifiedMode() {
// Update cgroup v2 memory.min settings. Called only when MemoryQoS is
// enabled and cgroups v2 is the unified mode.
if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.MemoryQoS) && libcontainercgroups.IsCgroup2UnifiedMode() {
m.setMemoryQoS(logger, qosConfigs)
}