From a6b928d90c64eba83ede0dc013234188662e1d02 Mon Sep 17 00:00:00 2001 From: Francesco Romani Date: Mon, 31 Oct 2022 15:52:06 +0100 Subject: [PATCH] kubelet: cpumgr: internal variable trivial rename CPUManager is going GA, thus it makes little sense to keep the names of the internal configuration variables `Experimental*`. Trivial rename only. Signed-off-by: Francesco Romani --- cmd/kubelet/app/server.go | 6 +++--- pkg/kubelet/cm/container_manager.go | 6 +++--- pkg/kubelet/cm/container_manager_linux.go | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index b25b277f9da..46239c60b24 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -737,9 +737,9 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend HardEvictionThresholds: hardEvictionThresholds, }, QOSReserved: *experimentalQOSReserved, - ExperimentalCPUManagerPolicy: s.CPUManagerPolicy, - ExperimentalCPUManagerPolicyOptions: cpuManagerPolicyOptions, - ExperimentalCPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, + CPUManagerPolicy: s.CPUManagerPolicy, + CPUManagerPolicyOptions: cpuManagerPolicyOptions, + CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy, ExperimentalMemoryManagerReservedMemory: s.ReservedMemory, ExperimentalPodPidsLimit: s.PodPidsLimit, diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index bf52a1e4c06..8b94671be7e 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -134,10 +134,10 @@ type NodeConfig struct { ProtectKernelDefaults bool NodeAllocatableConfig QOSReserved map[v1.ResourceName]int64 - ExperimentalCPUManagerPolicy string - ExperimentalCPUManagerPolicyOptions map[string]string + CPUManagerPolicy string + CPUManagerPolicyOptions map[string]string ExperimentalTopologyManagerScope string - ExperimentalCPUManagerReconcilePeriod time.Duration + CPUManagerReconcilePeriod time.Duration ExperimentalMemoryManagerPolicy string ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation ExperimentalPodPidsLimit int64 diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index 14e981b9d34..d066cd7787d 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -311,9 +311,9 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I // Initialize CPU manager cm.cpuManager, err = cpumanager.NewManager( - nodeConfig.ExperimentalCPUManagerPolicy, - nodeConfig.ExperimentalCPUManagerPolicyOptions, - nodeConfig.ExperimentalCPUManagerReconcilePeriod, + nodeConfig.CPUManagerPolicy, + nodeConfig.CPUManagerPolicyOptions, + nodeConfig.CPUManagerReconcilePeriod, machineInfo, nodeConfig.NodeAllocatableConfig.ReservedSystemCPUs, cm.GetNodeAllocatableReservation(),