From dc258e65ac11f3fa2082fb9a5b19431982ba7044 Mon Sep 17 00:00:00 2001 From: Talor Itzhak Date: Sun, 10 Nov 2024 13:47:17 +0200 Subject: [PATCH] memmanager:cleanup: drop `Experimental` prefix Since MemoryManager goes GA, we should drop the `Experimental` prefix from the its fields. Signed-off-by: Talor Itzhak --- cmd/kubelet/app/server.go | 24 +++++++++---------- pkg/kubelet/cm/container_manager.go | 26 ++++++++++----------- pkg/kubelet/cm/container_manager_linux.go | 4 ++-- pkg/kubelet/cm/container_manager_windows.go | 4 ++-- pkg/kubelet/kubelet.go | 2 +- 5 files changed, 30 insertions(+), 30 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index cfcf6e7d5cd..78bf05105b1 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -865,18 +865,18 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend ReservedSystemCPUs: reservedSystemCPUs, HardEvictionThresholds: hardEvictionThresholds, }, - QOSReserved: *experimentalQOSReserved, - CPUManagerPolicy: s.CPUManagerPolicy, - CPUManagerPolicyOptions: cpuManagerPolicyOptions, - CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, - ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy, - ExperimentalMemoryManagerReservedMemory: s.ReservedMemory, - PodPidsLimit: s.PodPidsLimit, - EnforceCPULimits: s.CPUCFSQuota, - CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration, - TopologyManagerPolicy: s.TopologyManagerPolicy, - TopologyManagerScope: s.TopologyManagerScope, - TopologyManagerPolicyOptions: topologyManagerPolicyOptions, + QOSReserved: *experimentalQOSReserved, + CPUManagerPolicy: s.CPUManagerPolicy, + CPUManagerPolicyOptions: cpuManagerPolicyOptions, + CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, + MemoryManagerPolicy: s.MemoryManagerPolicy, + MemoryManagerReservedMemory: s.ReservedMemory, + PodPidsLimit: s.PodPidsLimit, + EnforceCPULimits: s.CPUCFSQuota, + CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration, + TopologyManagerPolicy: s.TopologyManagerPolicy, + TopologyManagerScope: s.TopologyManagerScope, + TopologyManagerPolicyOptions: topologyManagerPolicyOptions, }, s.FailSwapOn, kubeDeps.Recorder, diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index 71a1291d193..5f4b53dd0d2 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -174,19 +174,19 @@ type NodeConfig struct { KubeletRootDir string ProtectKernelDefaults bool NodeAllocatableConfig - QOSReserved map[v1.ResourceName]int64 - CPUManagerPolicy string - CPUManagerPolicyOptions map[string]string - TopologyManagerScope string - CPUManagerReconcilePeriod time.Duration - ExperimentalMemoryManagerPolicy string - ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation - PodPidsLimit int64 - EnforceCPULimits bool - CPUCFSQuotaPeriod time.Duration - TopologyManagerPolicy string - TopologyManagerPolicyOptions map[string]string - CgroupVersion int + QOSReserved map[v1.ResourceName]int64 + CPUManagerPolicy string + CPUManagerPolicyOptions map[string]string + TopologyManagerScope string + CPUManagerReconcilePeriod time.Duration + MemoryManagerPolicy string + MemoryManagerReservedMemory []kubeletconfig.MemoryReservation + PodPidsLimit int64 + EnforceCPULimits bool + CPUCFSQuotaPeriod time.Duration + TopologyManagerPolicy string + TopologyManagerPolicyOptions map[string]string + CgroupVersion int } type NodeAllocatableConfig struct { diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index efbd90c1d5f..93d9acfc4b8 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -336,10 +336,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I cm.topologyManager.AddHintProvider(cm.cpuManager) cm.memoryManager, err = memorymanager.NewManager( - nodeConfig.ExperimentalMemoryManagerPolicy, + nodeConfig.MemoryManagerPolicy, machineInfo, cm.GetNodeAllocatableReservation(), - nodeConfig.ExperimentalMemoryManagerReservedMemory, + nodeConfig.MemoryManagerReservedMemory, nodeConfig.KubeletRootDir, cm.topologyManager, ) diff --git a/pkg/kubelet/cm/container_manager_windows.go b/pkg/kubelet/cm/container_manager_windows.go index 352660dd653..524ba4c2598 100644 --- a/pkg/kubelet/cm/container_manager_windows.go +++ b/pkg/kubelet/cm/container_manager_windows.go @@ -168,10 +168,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I klog.InfoS("Creating memory manager") cm.memoryManager, err = memorymanager.NewManager( - nodeConfig.ExperimentalMemoryManagerPolicy, + nodeConfig.MemoryManagerPolicy, machineInfo, cm.GetNodeAllocatableReservation(), - nodeConfig.ExperimentalMemoryManagerReservedMemory, + nodeConfig.MemoryManagerReservedMemory, nodeConfig.KubeletRootDir, cm.topologyManager, ) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index b8bbfece860..2c44f8604b2 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -2853,7 +2853,7 @@ func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, v1.PodResizeStatus, string) } } if utilfeature.DefaultFeatureGate.Enabled(features.MemoryManager) { - if kl.containerManager.GetNodeConfig().ExperimentalMemoryManagerPolicy == "static" { + if kl.containerManager.GetNodeConfig().MemoryManagerPolicy == "static" { msg := "Resize is infeasible for Guaranteed Pods alongside Memory Manager static policy" klog.V(3).InfoS(msg, "pod", format.Pod(pod)) return false, v1.PodResizeStatusInfeasible, msg