Commit 536622fd authored by k8s-merge-robot's avatar k8s-merge-robot Committed by GitHub

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

Automatic merge from submit-queue fix return value
parents 1ab7671f b694fc06
...@@ -2384,7 +2384,7 @@ func (kl *Kubelet) matchesNodeSelector(pod *api.Pod) bool { ...@@ -2384,7 +2384,7 @@ func (kl *Kubelet) matchesNodeSelector(pod *api.Pod) bool {
node, err := kl.GetNode() node, err := kl.GetNode()
if err != nil { if err != nil {
glog.Errorf("error getting node: %v", err) glog.Errorf("error getting node: %v", err)
return true return false
} }
return predicates.PodMatchesNodeLabels(pod, node) return predicates.PodMatchesNodeLabels(pod, node)
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment