diff --git a/cmd/kubelet/app/server.go b/cmd/kubelet/app/server.go index 6a1a5b9788f..0e2600fb9e5 100644 --- a/cmd/kubelet/app/server.go +++ b/cmd/kubelet/app/server.go @@ -749,8 +749,8 @@ func run(ctx context.Context, s *options.KubeletServer, kubeDeps *kubelet.Depend PodPidsLimit: s.PodPidsLimit, EnforceCPULimits: s.CPUCFSQuota, CPUCFSQuotaPeriod: s.CPUCFSQuotaPeriod.Duration, - ExperimentalTopologyManagerPolicy: s.TopologyManagerPolicy, - ExperimentalTopologyManagerScope: s.TopologyManagerScope, + TopologyManagerPolicy: s.TopologyManagerPolicy, + TopologyManagerScope: s.TopologyManagerScope, ExperimentalTopologyManagerPolicyOptions: topologyManagerPolicyOptions, }, s.FailSwapOn, diff --git a/pkg/kubelet/cm/container_manager.go b/pkg/kubelet/cm/container_manager.go index 6e7d3f72246..b9aede1a3ff 100644 --- a/pkg/kubelet/cm/container_manager.go +++ b/pkg/kubelet/cm/container_manager.go @@ -148,14 +148,14 @@ type NodeConfig struct { QOSReserved map[v1.ResourceName]int64 CPUManagerPolicy string CPUManagerPolicyOptions map[string]string - ExperimentalTopologyManagerScope string + TopologyManagerScope string CPUManagerReconcilePeriod time.Duration ExperimentalMemoryManagerPolicy string ExperimentalMemoryManagerReservedMemory []kubeletconfig.MemoryReservation PodPidsLimit int64 EnforceCPULimits bool CPUCFSQuotaPeriod time.Duration - ExperimentalTopologyManagerPolicy string + TopologyManagerPolicy string ExperimentalTopologyManagerPolicyOptions map[string]string } diff --git a/pkg/kubelet/cm/container_manager_linux.go b/pkg/kubelet/cm/container_manager_linux.go index d34df9566be..e54e12bfc5b 100644 --- a/pkg/kubelet/cm/container_manager_linux.go +++ b/pkg/kubelet/cm/container_manager_linux.go @@ -291,8 +291,8 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I cm.topologyManager, err = topologymanager.NewManager( machineInfo.Topology, - nodeConfig.ExperimentalTopologyManagerPolicy, - nodeConfig.ExperimentalTopologyManagerScope, + nodeConfig.TopologyManagerPolicy, + nodeConfig.TopologyManagerScope, nodeConfig.ExperimentalTopologyManagerPolicyOptions, )