Fix rebase issue

tallclair · tallclair · commit bbb939357e64 · 2019-10-30T17:50:13.000-07:00
diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
@@ -591,7 +591,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,
 		}
 	}
 	// podManager is also responsible for keeping secretManager and configMapManager contents up-to-date.
-	mirrorPodClient := kubepod.NewBasicMirrorClient(klet.kubeClient, string(nodeName), nodeInfo.NodeLister)
+	mirrorPodClient := kubepod.NewBasicMirrorClient(klet.kubeClient, string(nodeName), nodeLister)
 	klet.podManager = kubepod.NewBasicPodManager(mirrorPodClient, secretManager, configMapManager, checkpointManager)
 
 	klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet)

Original file line number	Diff line number	Diff line change
`@@ -591,7 +591,7 @@ func NewMainKubelet(kubeCfg *kubeletconfiginternal.KubeletConfiguration,`
`591`	`591`	`}`
`592`	`592`	`}`
`593`	`593`	`// podManager is also responsible for keeping secretManager and configMapManager contents up-to-date.`
`594`		`- mirrorPodClient := kubepod.NewBasicMirrorClient(klet.kubeClient, string(nodeName), nodeInfo.NodeLister)`
	`594`	`+ mirrorPodClient := kubepod.NewBasicMirrorClient(klet.kubeClient, string(nodeName), nodeLister)`
`595`	`595`	`klet.podManager = kubepod.NewBasicPodManager(mirrorPodClient, secretManager, configMapManager, checkpointManager)`
`596`	`596`
`597`	`597`	`klet.statusManager = status.NewManager(klet.kubeClient, klet.podManager, klet)`