Merge pull request #30475 from derekwaynecarr/pod-cgroup
Automatic merge from submit-queue Unblock iterative development on pod-level cgroups In order to allow forward progress on this feature, it takes the commits from #28017 #29049 and then it globally disables the flag that allows these features to be exercised in the kubelet. The flag can be re-added to the kubelet when its actually ready. /cc @vishh @dubstack @kubernetes/rh-cluster-infra
This commit is contained in:
@@ -935,7 +935,13 @@ func (kl *Kubelet) initializeModules() error {
|
||||
}
|
||||
|
||||
// Step 5: Start container manager.
|
||||
if err := kl.containerManager.Start(); err != nil {
|
||||
node, err := kl.getNodeAnyWay()
|
||||
if err != nil {
|
||||
glog.Errorf("Cannot get Node info: %v", err)
|
||||
return fmt.Errorf("Kubelet failed to get node info.")
|
||||
}
|
||||
|
||||
if err := kl.containerManager.Start(node); err != nil {
|
||||
return fmt.Errorf("Failed to start ContainerManager %v", err)
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user