Merge pull request #10312 from dchen1107/cleanup

Take 2: Fix the race between configuring cbr0 and restarting static pods

pkg/kubelet/status_manager.go

@@ -142,6 +142,10 @@ func (s *statusManager) RemoveOrphanedStatuses(podFullNames map[string]bool) {
 
 // syncBatch syncs pods statuses with the apiserver.
 func (s *statusManager) syncBatch() error {
+	if s.kubeClient == nil {
+		glog.V(4).Infof("Kubernetes client is nil, skipping pod status updates")
+		return nil
+	}
 	syncRequest := <-s.podStatusChannel
 	pod := syncRequest.pod
 	podFullName := kubecontainer.GetPodFullName(pod)