scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 03:38:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change function signature for MatchNodeSelectorTerms

Browse Source 
As part of externalizing this function to the k8s.io/component-helpers repo,
this commit simplifies the function signature and makes its 2 helpers private
(nodeSelectorRequirementsAsSelector and nodeSelectorRequirementsAsFieldSelector).
This commit is contained in:
Mike Dame
2020-10-26 11:05:07 -04:00
parent 0ec6602679
commit d9f334683e
9 changed files with 147 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/scheduler/framework/plugins/nodeaffinity/node_affinity.go
View File

@@ -21,7 +21,6 @@ import (
"fmt"
v1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
"k8s.io/kubernetes/pkg/scheduler/framework"
@@ -88,12 +87,12 @@ func (pl *NodeAffinity) Score(ctx context.Context, state *framework.CycleState,
}
// TODO: Avoid computing it for all nodes if this becomes a performance problem.
nodeSelector, err := v1helper.NodeSelectorRequirementsAsSelector(preferredSchedulingTerm.Preference.MatchExpressions)
matches, err := v1helper.MatchNodeSelectorTerms(node, &v1.NodeSelector{NodeSelectorTerms: []v1.NodeSelectorTerm{preferredSchedulingTerm.Preference}})
if err != nil {
return 0, framework.AsStatus(err)
}
if nodeSelector.Matches(labels.Set(node.Labels)) {
if matches {
count += int64(preferredSchedulingTerm.Weight)
}
}