From 9ae3107aab522b349d4caa759d0b68448a07a486 Mon Sep 17 00:00:00 2001 From: Guangya Liu Date: Tue, 30 May 2017 20:30:40 +0800 Subject: [PATCH] Highlight nodeSelector when checking nodeSelector for Pod. --- plugin/pkg/scheduler/algorithm/predicates/predicates.go | 4 ++-- .../pkg/scheduler/algorithm/predicates/predicates_test.go | 8 ++++---- .../pkg/scheduler/algorithmprovider/defaults/defaults.go | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/plugin/pkg/scheduler/algorithm/predicates/predicates.go b/plugin/pkg/scheduler/algorithm/predicates/predicates.go index 6a86bebaf6a..63540d693d4 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates.go @@ -654,7 +654,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") @@ -932,7 +932,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 1118c4842b4..af4bb1f2902 100644 --- a/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go +++ b/plugin/pkg/scheduler/algorithm/predicates/predicates_test.go @@ -1288,7 +1288,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) } @@ -2999,7 +2999,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) } @@ -3951,7 +3951,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) } @@ -4767,7 +4767,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 d03ca433ff9..24435203b10 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)