From bb2bb3cd74e9aa8a423697d86a033bd573837047 Mon Sep 17 00:00:00 2001 From: Michael Aspinwall Date: Thu, 16 Apr 2026 23:34:26 +0000 Subject: [PATCH] Gate setting memory QoS behind feature gate --- pkg/kubelet/cm/qos_container_manager_linux.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkg/kubelet/cm/qos_container_manager_linux.go b/pkg/kubelet/cm/qos_container_manager_linux.go index 8f563b8c821..c27a4738952 100644 --- a/pkg/kubelet/cm/qos_container_manager_linux.go +++ b/pkg/kubelet/cm/qos_container_manager_linux.go @@ -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) }