github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #128727 from Tal-or/memorymanager_cleanup

Browse Source 
memmanager:cleanup: drop `Experimental` prefix
This commit is contained in:
Kubernetes Prow Robot 2025-01-23 14:15:20 -08:00 committed by GitHub
commit 28ad751946
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
cmd/kubelet/app/server.go
View File

@ -860,18 +860,18 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
ReservedSystemCPUs: reservedSystemCPUs, ReservedSystemCPUs: reservedSystemCPUs,
HardEvictionThresholds: hardEvictionThresholds, HardEvictionThresholds: hardEvictionThresholds,
}, },
QOSReserved: *experimentalQOSReserved, QOSReserved: *experimentalQOSReserved,
CPUManagerPolicy: s.CPUManagerPolicy, CPUManagerPolicy: s.CPUManagerPolicy,
CPUManagerPolicyOptions: cpuManagerPolicyOptions, CPUManagerPolicyOptions: cpuManagerPolicyOptions,
CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration,
ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy, MemoryManagerPolicy: s.MemoryManagerPolicy,
ExperimentalMemoryManagerReservedMemory: s.ReservedMemory, MemoryManagerReservedMemory: s.ReservedMemory,
PodPidsLimit: s.PodPidsLimit, PodPidsLimit: s.PodPidsLimit,
EnforceCPULimits: s.CPUCFSQuota, EnforceCPULimits: s.CPUCFSQuota,
CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration, CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration,
TopologyManagerPolicy: s.TopologyManagerPolicy, TopologyManagerPolicy: s.TopologyManagerPolicy,
TopologyManagerScope: s.TopologyManagerScope, TopologyManagerScope: s.TopologyManagerScope,
TopologyManagerPolicyOptions: topologyManagerPolicyOptions, TopologyManagerPolicyOptions: topologyManagerPolicyOptions,
}, },
s.FailSwapOn, s.FailSwapOn,
kubeDeps.Recorder, kubeDeps.Recorder,

26
pkg/kubelet/cm/container_manager.go
View File

@ -174,19 +174,19 @@ type NodeConfig struct {
KubeletRootDir string KubeletRootDir string
ProtectKernelDefaults bool ProtectKernelDefaults bool
NodeAllocatableConfig NodeAllocatableConfig
QOSReserved map[v1.ResourceName]int64 QOSReserved map[v1.ResourceName]int64
CPUManagerPolicy string CPUManagerPolicy string
CPUManagerPolicyOptions map[string]string CPUManagerPolicyOptions map[string]string
TopologyManagerScope string TopologyManagerScope string
CPUManagerReconcilePeriod time.Duration CPUManagerReconcilePeriod time.Duration
ExperimentalMemoryManagerPolicy string MemoryManagerPolicy string
ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation MemoryManagerReservedMemory []kubeletconfig.MemoryReservation
PodPidsLimit int64 PodPidsLimit int64
EnforceCPULimits bool EnforceCPULimits bool
CPUCFSQuotaPeriod time.Duration CPUCFSQuotaPeriod time.Duration
TopologyManagerPolicy string TopologyManagerPolicy string
TopologyManagerPolicyOptions map[string]string TopologyManagerPolicyOptions map[string]string
CgroupVersion int CgroupVersion int
} }
type NodeAllocatableConfig struct { type NodeAllocatableConfig struct {

4
pkg/kubelet/cm/container_manager_linux.go
View File

@ -336,10 +336,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
cm.topologyManager.AddHintProvider(cm.cpuManager) cm.topologyManager.AddHintProvider(cm.cpuManager)
cm.memoryManager, err = memorymanager.NewManager( cm.memoryManager, err = memorymanager.NewManager(
nodeConfig.ExperimentalMemoryManagerPolicy, nodeConfig.MemoryManagerPolicy,
machineInfo, machineInfo,
cm.GetNodeAllocatableReservation(), cm.GetNodeAllocatableReservation(),
nodeConfig.ExperimentalMemoryManagerReservedMemory, nodeConfig.MemoryManagerReservedMemory,
nodeConfig.KubeletRootDir, nodeConfig.KubeletRootDir,
cm.topologyManager, cm.topologyManager,
) )

4
pkg/kubelet/cm/container_manager_windows.go
View File

@ -168,10 +168,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
klog.InfoS("Creating memory manager") klog.InfoS("Creating memory manager")
cm.memoryManager, err = memorymanager.NewManager( cm.memoryManager, err = memorymanager.NewManager(
nodeConfig.ExperimentalMemoryManagerPolicy, nodeConfig.MemoryManagerPolicy,
machineInfo, machineInfo,
cm.GetNodeAllocatableReservation(), cm.GetNodeAllocatableReservation(),
nodeConfig.ExperimentalMemoryManagerReservedMemory, nodeConfig.MemoryManagerReservedMemory,
nodeConfig.KubeletRootDir, nodeConfig.KubeletRootDir,
cm.topologyManager, cm.topologyManager,
) )

2
pkg/kubelet/kubelet.go
View File

@ -2853,7 +2853,7 @@ func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, v1.PodResizeStatus, string)
} }
} }
if utilfeature.DefaultFeatureGate.Enabled(features.MemoryManager) { 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" msg := "Resize is infeasible for Guaranteed Pods alongside Memory Manager static policy"
klog.V(3).InfoS(msg, "pod", format.Pod(pod)) klog.V(3).InfoS(msg, "pod", format.Pod(pod))
return false, v1.PodResizeStatusInfeasible, msg return false, v1.PodResizeStatusInfeasible, msg