Merge pull request kubernetes#86599 from denkensk/move-nodepreferavoidpods-scoreplugin

move nodepreferavoidpods to score plugin

Author: k8s-ci-robot

pkg/scheduler/algorithm/priorities/BUILD

@@ -14,7 +14,6 @@ go_library(
         "least_requested.go",
         "metadata.go",
         "most_requested.go",
-        "node_prefer_avoid_pods.go",
         "priorities.go",
         "reduce.go",
         "requested_to_capacity_ratio.go",
@@ -54,7 +53,6 @@ go_test(
         "least_requested_test.go",
         "metadata_test.go",
         "most_requested_test.go",
-        "node_prefer_avoid_pods_test.go",
         "requested_to_capacity_ratio_test.go",
         "resource_limits_test.go",
         "selector_spreading_test.go",

pkg/scheduler/algorithm/priorities/metadata.go

@@ -58,7 +58,6 @@ func NewMetadataFactory(
 type priorityMetadata struct {
 	podLimits               *schedulernodeinfo.Resource
 	podSelector             labels.Selector
-	controllerRef           *metav1.OwnerReference
 	podFirstServiceSelector labels.Selector
 	podTopologySpreadMap    *podTopologySpreadMap
 }
@@ -87,7 +86,6 @@ func (pmf *MetadataFactory) PriorityMetadata(
 	return &priorityMetadata{
 		podLimits:               getResourceLimits(pod),
 		podSelector:             getSelector(pod, pmf.serviceLister, pmf.controllerLister, pmf.replicaSetLister, pmf.statefulSetLister),
-		controllerRef:           metav1.GetControllerOf(pod),
 		podFirstServiceSelector: getFirstServiceSelector(pod, pmf.serviceLister),
 		podTopologySpreadMap:    tpSpreadMap,
 	}

pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods.go

@@ -80,7 +80,7 @@ func init() {
 
 	// Set this weight large enough to override all other priority functions.
 	// TODO: Figure out a better way to do this, maybe at same time as fixing #24720.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.NodePreferAvoidPodsPriority, priorities.CalculateNodePreferAvoidPodsPriorityMap, nil, 10000)
+	scheduler.RegisterPriorityMapReduceFunction(priorities.NodePreferAvoidPodsPriority, nil, nil, 10000)
 
 	// Prioritizes nodes that have labels matching NodeAffinity
 	scheduler.RegisterPriorityMapReduceFunction(priorities.NodeAffinityPriority, nil, nil, 1)

pkg/scheduler/algorithm/priorities/node_prefer_avoid_pods_test.go

@@ -6,10 +6,10 @@ go_library(
     importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/nodepreferavoidpods",
     visibility = ["//visibility:public"],
     deps = [
-        "//pkg/scheduler/algorithm/priorities:go_default_library",
-        "//pkg/scheduler/framework/plugins/migration:go_default_library",
+        "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//staging/src/k8s.io/api/core/v1:go_default_library",
+        "//staging/src/k8s.io/apimachinery/pkg/apis/meta/v1:go_default_library",
         "//staging/src/k8s.io/apimachinery/pkg/runtime:go_default_library",
     ],
 )

pkg/scheduler/algorithmprovider/defaults/register_priorities.go

@@ -21,9 +21,9 @@ import (
 	"fmt"
 
 	v1 "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
-	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/migration"
+	v1helper "k8s.io/kubernetes/pkg/apis/core/v1/helper"
 	framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 )
 
@@ -50,9 +50,35 @@ func (pl *NodePreferAvoidPods) Score(ctx context.Context, state *framework.Cycle
 		return 0, framework.NewStatus(framework.Error, fmt.Sprintf("getting node %q from Snapshot: %v", nodeName, err))
 	}
 
-	meta := migration.PriorityMetadata(state)
-	s, err := priorities.CalculateNodePreferAvoidPodsPriorityMap(pod, meta, nodeInfo)
-	return s.Score, migration.ErrorToFrameworkStatus(err)
+	node := nodeInfo.Node()
+	if node == nil {
+		return 0, framework.NewStatus(framework.Error, "node not found")
+	}
+
+	controllerRef := metav1.GetControllerOf(pod)
+	if controllerRef != nil {
+		// Ignore pods that are owned by other controller than ReplicationController
+		// or ReplicaSet.
+		if controllerRef.Kind != "ReplicationController" && controllerRef.Kind != "ReplicaSet" {
+			controllerRef = nil
+		}
+	}
+	if controllerRef == nil {
+		return framework.MaxNodeScore, nil
+	}
+
+	avoids, err := v1helper.GetAvoidPodsFromNodeAnnotations(node.Annotations)
+	if err != nil {
+		// If we cannot get annotation, assume it's schedulable there.
+		return framework.MaxNodeScore, nil
+	}
+	for i := range avoids.PreferAvoidPods {
+		avoid := &avoids.PreferAvoidPods[i]
+		if avoid.PodSignature.PodController.Kind == controllerRef.Kind && avoid.PodSignature.PodController.UID == controllerRef.UID {
+			return 0, nil
+		}
+	}
+	return framework.MaxNodeScore, nil
 }
 
 // ScoreExtensions of the Score plugin.