github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Automatic merge from submit-queue

fix return value
This commit is contained in:
k8s-merge-robot
2016-06-30 21:14:15 -07:00
committed by GitHub
parent 1ab7671fdc b694fc0688
commit 536622fd07
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/kubelet.go
View File

@@ -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)
} }