github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 19:56:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #80448 from tedyu/node-info-key

Browse Source 
Check error return from GetPodKey
This commit is contained in:
Kubernetes Prow Robot 2019-07-26 20:16:23 -07:00 committed by GitHub
commit bc8ca12c87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/scheduler/nodeinfo/node_info.go
View File

@ -712,7 +712,10 @@ func (n *NodeInfo) FilterOutPods(pods []*v1.Pod) []*v1.Pod {
continue continue
} }
// If pod is on the given node, add it to 'filtered' only if it is present in nodeInfo. // If pod is on the given node, add it to 'filtered' only if it is present in nodeInfo.
podKey, _ := GetPodKey(p) podKey, err := GetPodKey(p)
if err != nil {
continue
}
for _, np := range n.Pods() { for _, np := range n.Pods() {
npodkey, _ := GetPodKey(np) npodkey, _ := GetPodKey(np)
if npodkey == podKey { if npodkey == podKey {