Skip to content

Commit dc258e6

Browse files
committed
memmanager:cleanup: drop Experimental prefix
Since MemoryManager goes GA, we should drop the `Experimental` prefix from the its fields. Signed-off-by: Talor Itzhak <[email protected]>
1 parent 6b031e5 commit dc258e6

File tree

5 files changed

+30
-30
lines changed

5 files changed

+30
-30
lines changed

cmd/kubelet/app/server.go

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -865,18 +865,18 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
865865
ReservedSystemCPUs: reservedSystemCPUs,
866866
HardEvictionThresholds: hardEvictionThresholds,
867867
},
868-
QOSReserved: *experimentalQOSReserved,
869-
CPUManagerPolicy: s.CPUManagerPolicy,
870-
CPUManagerPolicyOptions: cpuManagerPolicyOptions,
871-
CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration,
872-
ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy,
873-
ExperimentalMemoryManagerReservedMemory: s.ReservedMemory,
874-
PodPidsLimit: s.PodPidsLimit,
875-
EnforceCPULimits: s.CPUCFSQuota,
876-
CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration,
877-
TopologyManagerPolicy: s.TopologyManagerPolicy,
878-
TopologyManagerScope: s.TopologyManagerScope,
879-
TopologyManagerPolicyOptions: topologyManagerPolicyOptions,
868+
QOSReserved: *experimentalQOSReserved,
869+
CPUManagerPolicy: s.CPUManagerPolicy,
870+
CPUManagerPolicyOptions: cpuManagerPolicyOptions,
871+
CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration,
872+
MemoryManagerPolicy: s.MemoryManagerPolicy,
873+
MemoryManagerReservedMemory: s.ReservedMemory,
874+
PodPidsLimit: s.PodPidsLimit,
875+
EnforceCPULimits: s.CPUCFSQuota,
876+
CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration,
877+
TopologyManagerPolicy: s.TopologyManagerPolicy,
878+
TopologyManagerScope: s.TopologyManagerScope,
879+
TopologyManagerPolicyOptions: topologyManagerPolicyOptions,
880880
},
881881
s.FailSwapOn,
882882
kubeDeps.Recorder,

pkg/kubelet/cm/container_manager.go

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -174,19 +174,19 @@ type NodeConfig struct {
174174
KubeletRootDir string
175175
ProtectKernelDefaults bool
176176
NodeAllocatableConfig
177-
QOSReserved map[v1.ResourceName]int64
178-
CPUManagerPolicy string
179-
CPUManagerPolicyOptions map[string]string
180-
TopologyManagerScope string
181-
CPUManagerReconcilePeriod time.Duration
182-
ExperimentalMemoryManagerPolicy string
183-
ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation
184-
PodPidsLimit int64
185-
EnforceCPULimits bool
186-
CPUCFSQuotaPeriod time.Duration
187-
TopologyManagerPolicy string
188-
TopologyManagerPolicyOptions map[string]string
189-
CgroupVersion int
177+
QOSReserved map[v1.ResourceName]int64
178+
CPUManagerPolicy string
179+
CPUManagerPolicyOptions map[string]string
180+
TopologyManagerScope string
181+
CPUManagerReconcilePeriod time.Duration
182+
MemoryManagerPolicy string
183+
MemoryManagerReservedMemory []kubeletconfig.MemoryReservation
184+
PodPidsLimit int64
185+
EnforceCPULimits bool
186+
CPUCFSQuotaPeriod time.Duration
187+
TopologyManagerPolicy string
188+
TopologyManagerPolicyOptions map[string]string
189+
CgroupVersion int
190190
}
191191

192192
type NodeAllocatableConfig struct {

pkg/kubelet/cm/container_manager_linux.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
336336
cm.topologyManager.AddHintProvider(cm.cpuManager)
337337

338338
cm.memoryManager, err = memorymanager.NewManager(
339-
nodeConfig.ExperimentalMemoryManagerPolicy,
339+
nodeConfig.MemoryManagerPolicy,
340340
machineInfo,
341341
cm.GetNodeAllocatableReservation(),
342-
nodeConfig.ExperimentalMemoryManagerReservedMemory,
342+
nodeConfig.MemoryManagerReservedMemory,
343343
nodeConfig.KubeletRootDir,
344344
cm.topologyManager,
345345
)

pkg/kubelet/cm/container_manager_windows.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,10 +168,10 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
168168

169169
klog.InfoS("Creating memory manager")
170170
cm.memoryManager, err = memorymanager.NewManager(
171-
nodeConfig.ExperimentalMemoryManagerPolicy,
171+
nodeConfig.MemoryManagerPolicy,
172172
machineInfo,
173173
cm.GetNodeAllocatableReservation(),
174-
nodeConfig.ExperimentalMemoryManagerReservedMemory,
174+
nodeConfig.MemoryManagerReservedMemory,
175175
nodeConfig.KubeletRootDir,
176176
cm.topologyManager,
177177
)

pkg/kubelet/kubelet.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2853,7 +2853,7 @@ func (kl *Kubelet) canResizePod(pod *v1.Pod) (bool, v1.PodResizeStatus, string)
28532853
}
28542854
}
28552855
if utilfeature.DefaultFeatureGate.Enabled(features.MemoryManager) {
2856-
if kl.containerManager.GetNodeConfig().ExperimentalMemoryManagerPolicy == "static" {
2856+
if kl.containerManager.GetNodeConfig().MemoryManagerPolicy == "static" {
28572857
msg := "Resize is infeasible for Guaranteed Pods alongside Memory Manager static policy"
28582858
klog.V(3).InfoS(msg, "pod", format.Pod(pod))
28592859
return false, v1.PodResizeStatusInfeasible, msg

0 commit comments

Comments
 (0)