Merge pull request #73920 from nolancon/topology-manager-cpu-manager

Changes to make CPU Manager a Hint Provider for Topology Manager
This commit is contained in:
Kubernetes Prow Robot
2019-08-15 05:44:33 -07:00
committed by GitHub
11 changed files with 513 additions and 16 deletions

View File

@@ -312,11 +312,13 @@ func NewContainerManager(mountUtil mount.Interface, cadvisorInterface cadvisor.I
machineInfo,
cm.GetNodeAllocatableReservation(),
nodeConfig.KubeletRootDir,
cm.topologyManager,
)
if err != nil {
klog.Errorf("failed to initialize cpu manager: %v", err)
return nil, err
}
cm.topologyManager.AddHintProvider(cm.cpuManager)
}
return cm, nil