Merge pull request #27923 from kevinjkj/kevinjkj-patch-2-1

Automatic merge from submit-queue

fix return value
pull/6/head
k8s-merge-robot 2016-06-30 21:14:15 -07:00 committed by GitHub
commit 536622fd07
1 changed files with 1 additions and 1 deletions

View File

@ -2384,7 +2384,7 @@ func (kl *Kubelet) matchesNodeSelector(pod *api.Pod) bool {
node, err := kl.GetNode()
if err != nil {
glog.Errorf("error getting node: %v", err)
return true
return false
}
return predicates.PodMatchesNodeLabels(pod, node)
}