diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index f3c6116b6d7..95939bf5043 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -692,7 +692,7 @@ func podMatchesNodeLabels(pod *v1.Pod, node *v1.Node) bool { return nodeAffinityMatches } -func PodSelectorMatches(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []algorithm.PredicateFailureReason, error) { +func PodMatchNodeSelector(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache.NodeInfo) (bool, []algorithm.PredicateFailureReason, error) { node := nodeInfo.Node() if node == nil { return false, nil, fmt.Errorf("node not found") @@ -952,7 +952,7 @@ func EssentialPredicates(pod *v1.Pod, meta interface{}, nodeInfo *schedulercache predicateFails = append(predicateFails, reasons...) } - fit, reasons, err = PodSelectorMatches(pod, meta, nodeInfo) + fit, reasons, err = PodMatchNodeSelector(pod, meta, nodeInfo) if err != nil { return false, predicateFails, err } diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go index c8495052fb3..a410641e197 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go @@ -1391,7 +1391,7 @@ func TestPodFitsSelector(t *testing.T) { nodeInfo := schedulercache.NewNodeInfo() nodeInfo.SetNode(&node) - fits, reasons, err := PodSelectorMatches(test.pod, PredicateMetadata(test.pod, nil), nodeInfo) + fits, reasons, err := PodMatchNodeSelector(test.pod, PredicateMetadata(test.pod, nil), nodeInfo) if err != nil { t.Errorf("%s: unexpected error: %v", test.test, err) } @@ -3102,7 +3102,7 @@ func TestInterPodAffinityWithMultipleNodes(t *testing.T) { nodeInfo := schedulercache.NewNodeInfo() nodeInfo.SetNode(&node) nodeInfoMap := map[string]*schedulercache.NodeInfo{node.Name: nodeInfo} - fits2, reasons, err := PodSelectorMatches(test.pod, PredicateMetadata(test.pod, nodeInfoMap), nodeInfo) + fits2, reasons, err := PodMatchNodeSelector(test.pod, PredicateMetadata(test.pod, nodeInfoMap), nodeInfo) if err != nil { t.Errorf("%s: unexpected error: %v", test.test, err) } @@ -4054,7 +4054,7 @@ func TestPodAnnotationFitsSelector(t *testing.T) { nodeInfo := schedulercache.NewNodeInfo() nodeInfo.SetNode(&node) - fits, reasons, err := PodSelectorMatches(test.pod, PredicateMetadata(test.pod, nil), nodeInfo) + fits, reasons, err := PodMatchNodeSelector(test.pod, PredicateMetadata(test.pod, nil), nodeInfo) if err != nil { t.Errorf("%s: unexpected error: %v", test.test, err) } @@ -4870,7 +4870,7 @@ func TestInterPodAffinityAnnotationsWithMultipleNodes(t *testing.T) { nodeInfo := schedulercache.NewNodeInfo() nodeInfo.SetNode(&node) nodeInfoMap := map[string]*schedulercache.NodeInfo{node.Name: nodeInfo} - fits2, reasons, err := PodSelectorMatches(test.pod, PredicateMetadata(test.pod, nodeInfoMap), nodeInfo) + fits2, reasons, err := PodMatchNodeSelector(test.pod, PredicateMetadata(test.pod, nodeInfoMap), nodeInfo) if err != nil { t.Errorf("%s: unexpected error: %v", test.test, err) } diff --git a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go index 94447611a13..fe4edabd97b 100644 --- a/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go +++ b/plugin/pkg/scheduler/algorithmprovider/defaults/defaults.go @@ -86,7 +86,7 @@ func init() { // predicates.GeneralPredicates() factory.RegisterFitPredicate("HostName", predicates.PodFitsHost) // Fit is determined by node selector query. - factory.RegisterFitPredicate("MatchNodeSelector", predicates.PodSelectorMatches) + factory.RegisterFitPredicate("MatchNodeSelector", predicates.PodMatchNodeSelector) // Use equivalence class to speed up predicates & priorities factory.RegisterGetEquivalencePodFunction(GetEquivalencePod)