Revert "Fix the race between configuring cbr0 and restarting static pods"

This commit is contained in:
Piotr Szczesniak
2015-06-24 09:56:49 +02:00
parent 5b4dc4edaa
commit fd0a95dd12
11 changed files with 40 additions and 147 deletions

View File

@@ -17,7 +17,6 @@ limitations under the License.
package kubelet
import (
"errors"
"fmt"
"reflect"
"sort"
@@ -143,9 +142,6 @@ 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)