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

Merge pull request #40800 from k82cn/topology_compare

Browse Source 
Automatic merge from submit-queue

Empty label is equal for topologies.

fixes #40799
This commit is contained in:
Kubernetes Submit Queue
2017-04-11 00:39:04 -07:00
committed by GitHub
parent 2fa1eb0631 f88ebfad3e
commit e58d3dbf06
3 changed files with 150 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
plugin/pkg/scheduler/algorithm/priorities/util/topologies.go
View File

@@ -56,7 +56,20 @@ func NodesHaveSameTopologyKey(nodeA, nodeB *v1.Node, topologyKey string) bool {
if len(topologyKey) == 0 {
return false
}
return nodeA.Labels != nil && nodeB.Labels != nil && len(nodeA.Labels[topologyKey]) > 0 && nodeA.Labels[topologyKey] == nodeB.Labels[topologyKey]
if nodeA.Labels == nil || nodeB.Labels == nil {
return false
}
nodeALabel, okA := nodeA.Labels[topologyKey]
nodeBLabel, okB := nodeB.Labels[topologyKey]
// If found label in both nodes, check the label
if okB && okA {
return nodeALabel == nodeBLabel
}
return false
}
type Topologies struct {