Merge pull request #21360 from vishh/21252

Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-17 05:00:25 -08:00
commit e92f5890aa

View File

@ -429,8 +429,6 @@ func NewMainKubelet(
}
klet.imageManager = imageManager
klet.runtimeState.setRuntimeSync(klet.clock.Now())
klet.runner = klet.containerRuntime
klet.podManager = kubepod.NewBasicPodManager(kubepod.NewBasicMirrorClient(klet.kubeClient))
klet.statusManager = status.NewManager(kubeClient, klet.podManager)