github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-25 04:33:26 +00:00
Code Issues Projects Releases Wiki Activity

kubelet: cpumgr: internal variable trivial rename

Browse Source 
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 <fromani@redhat.com>
This commit is contained in:
Francesco Romani 2022-10-31 15:52:06 +01:00
parent 5e12338a22
commit a6b928d90c
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -737,9 +737,9 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend
HardEvictionThresholds: hardEvictionThresholds, HardEvictionThresholds: hardEvictionThresholds,
}, },
QOSReserved: *experimentalQOSReserved, QOSReserved: *experimentalQOSReserved,
ExperimentalCPUManagerPolicy: s.CPUManagerPolicy, CPUManagerPolicy: s.CPUManagerPolicy,
ExperimentalCPUManagerPolicyOptions: cpuManagerPolicyOptions, CPUManagerPolicyOptions: cpuManagerPolicyOptions,
ExperimentalCPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration, CPUManagerReconcilePeriod: s.CPUManagerReconcilePeriod.Duration,
ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy, ExperimentalMemoryManagerPolicy: s.MemoryManagerPolicy,
ExperimentalMemoryManagerReservedMemory: s.ReservedMemory, ExperimentalMemoryManagerReservedMemory: s.ReservedMemory,
ExperimentalPodPidsLimit: s.PodPidsLimit, ExperimentalPodPidsLimit: s.PodPidsLimit,

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

@ -134,10 +134,10 @@ type NodeConfig struct {
ProtectKernelDefaults bool ProtectKernelDefaults bool
NodeAllocatableConfig NodeAllocatableConfig
QOSReserved map[v1.ResourceName]int64 QOSReserved map[v1.ResourceName]int64
ExperimentalCPUManagerPolicy string CPUManagerPolicy string
ExperimentalCPUManagerPolicyOptions map[string]string CPUManagerPolicyOptions map[string]string
ExperimentalTopologyManagerScope string ExperimentalTopologyManagerScope string
ExperimentalCPUManagerReconcilePeriod time.Duration CPUManagerReconcilePeriod time.Duration
ExperimentalMemoryManagerPolicy string ExperimentalMemoryManagerPolicy string
ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation
ExperimentalPodPidsLimit int64 ExperimentalPodPidsLimit int64

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

@ -311,9 +311,9 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
// Initialize CPU manager // Initialize CPU manager
cm.cpuManager, err = cpumanager.NewManager( cm.cpuManager, err = cpumanager.NewManager(
nodeConfig.ExperimentalCPUManagerPolicy, nodeConfig.CPUManagerPolicy,
nodeConfig.ExperimentalCPUManagerPolicyOptions, nodeConfig.CPUManagerPolicyOptions,
nodeConfig.ExperimentalCPUManagerReconcilePeriod, nodeConfig.CPUManagerReconcilePeriod,
machineInfo, machineInfo,
nodeConfig.NodeAllocatableConfig.ReservedSystemCPUs, nodeConfig.NodeAllocatableConfig.ReservedSystemCPUs,
cm.GetNodeAllocatableReservation(), cm.GetNodeAllocatableReservation(),