Merge pull request #138430 from michaelasp/gateMemoryQoS

Gate setting memory QoS behind feature gate
This commit is contained in:
Kubernetes Prow Robot
2026-04-17 09:05:03 +05:30
committed by GitHub

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)
}