Merge pull request #10211 from dchen1107/cleanup

Fix the race between configuring cbr0 and restarting static pods

pkg/kubelet/status_manager.go

@@ -17,6 +17,7 @@ limitations under the License.
 package kubelet
 
 import (
+	"errors"
 	"fmt"
 	"reflect"
 	"sort"
@@ -142,6 +143,9 @@ func (s *statusManager) RemoveOrphanedStatuses(podFullNames map[string]bool) {
 
 // syncBatch syncs pods statuses with the apiserver.
 func (s *statusManager) syncBatch() error {
+	if s.kubeClient == nil {
+		return errors.New("Kubernetes client is nil, skipping pod status updates")
+	}
 	syncRequest := <-s.podStatusChannel
 	pod := syncRequest.pod
 	podFullName := kubecontainer.GetPodFullName(pod)