diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 02f56d82418..f29988346e5 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -330,21 +330,19 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I } cm.topologyManager.AddHintProvider(cm.cpuManager) - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.MemoryManager) { - cm.memoryManager, err = memorymanager.NewManager( - nodeConfig.ExperimentalMemoryManagerPolicy, - machineInfo, - cm.GetNodeAllocatableReservation(), - nodeConfig.ExperimentalMemoryManagerReservedMemory, - nodeConfig.KubeletRootDir, - cm.topologyManager, - ) - if err != nil { - klog.ErrorS(err, "Failed to initialize memory manager") - return nil, err - } - cm.topologyManager.AddHintProvider(cm.memoryManager) + cm.memoryManager, err = memorymanager.NewManager( + nodeConfig.ExperimentalMemoryManagerPolicy, + machineInfo, + cm.GetNodeAllocatableReservation(), + nodeConfig.ExperimentalMemoryManagerReservedMemory, + nodeConfig.KubeletRootDir, + cm.topologyManager, + ) + if err != nil { + klog.ErrorS(err, "Failed to initialize memory manager") + return nil, err } + cm.topologyManager.AddHintProvider(cm.memoryManager) return cm, nil } @@ -577,12 +575,9 @@ func (cm *containerManagerImpl) Start(ctx context.Context, node *v1.Node, } // Initialize memory manager - if utilfeature.DefaultFeatureGate.Enabled(kubefeatures.MemoryManager) { - containerMap, _ := buildContainerMapAndRunningSetFromRuntime(ctx, runtimeService) - err := cm.memoryManager.Start(memorymanager.ActivePodsFunc(activePods), sourcesReady, podStatusProvider, runtimeService, containerMap) - if err != nil { - return fmt.Errorf("start memory manager error: %v", err) - } + err = cm.memoryManager.Start(memorymanager.ActivePodsFunc(activePods), sourcesReady, podStatusProvider, runtimeService, containerMap) + if err != nil { + return fmt.Errorf("start memory manager error: %v", err) } // cache the node Info including resource capacity and diff --git a/pkg/kubelet/metrics/metrics.go b/pkg/kubelet/metrics/metrics.go index 3050f3c5663..c7b6262563d 100644 --- a/pkg/kubelet/metrics/metrics.go +++ b/pkg/kubelet/metrics/metrics.go @@ -1065,10 +1065,8 @@ func Register(collectors ...metrics.StableCollector) { legacyregistry.MustRegister(CPUManagerSharedPoolSizeMilliCores) legacyregistry.MustRegister(CPUManagerExclusiveCPUsAllocationCount) legacyregistry.MustRegister(ContainerAlignedComputeResources) - if utilfeature.DefaultFeatureGate.Enabled(features.MemoryManager) { - legacyregistry.MustRegister(MemoryManagerPinningRequestTotal) - legacyregistry.MustRegister(MemoryManagerPinningErrorsTotal) - } + legacyregistry.MustRegister(MemoryManagerPinningRequestTotal) + legacyregistry.MustRegister(MemoryManagerPinningErrorsTotal) legacyregistry.MustRegister(TopologyManagerAdmissionRequestsTotal) legacyregistry.MustRegister(TopologyManagerAdmissionErrorsTotal) legacyregistry.MustRegister(TopologyManagerAdmissionDuration)