feat: implement node affinity priority as score plugin

+ Add DefaultNormalizeScore function
+ Implement NodeAffinity as score plugin

Author: draveness

pkg/scheduler/algorithm/priorities/BUILD

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

pkg/scheduler/algorithm/priorities/metadata.go

@@ -57,7 +57,6 @@ func NewMetadataFactory(
 // priorityMetadata is a type that is passed as metadata for priority functions
 type priorityMetadata struct {
 	podLimits               *schedulernodeinfo.Resource
-	affinity                *v1.Affinity
 	podSelector             labels.Selector
 	controllerRef           *metav1.OwnerReference
 	podFirstServiceSelector labels.Selector
@@ -87,7 +86,6 @@ func (pmf *MetadataFactory) PriorityMetadata(
 	}
 	return &priorityMetadata{
 		podLimits:               getResourceLimits(pod),
-		affinity:                pod.Spec.Affinity,
 		podSelector:             getSelector(pod, pmf.serviceLister, pmf.controllerLister, pmf.replicaSetLister, pmf.statefulSetLister),
 		controllerRef:           metav1.GetControllerOf(pod),
 		podFirstServiceSelector: getFirstServiceSelector(pod, pmf.serviceLister),

pkg/scheduler/algorithm/priorities/metadata_test.go

@@ -139,7 +139,6 @@ func TestPriorityMetadata(t *testing.T) {
 			pod: podWithTolerationsAndAffinity,
 			expected: &priorityMetadata{
 				podLimits:   nonPodLimits,
-				affinity:    podAffinity,
 				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with default requests",
@@ -148,7 +147,6 @@ func TestPriorityMetadata(t *testing.T) {
 			pod: podWithTolerationsAndRequests,
 			expected: &priorityMetadata{
 				podLimits:   nonPodLimits,
-				affinity:    nil,
 				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with tolerations and requests",
@@ -157,7 +155,6 @@ func TestPriorityMetadata(t *testing.T) {
 			pod: podWithAffinityAndRequests,
 			expected: &priorityMetadata{
 				podLimits:   specifiedPodLimits,
-				affinity:    podAffinity,
 				podSelector: labels.NewSelector(),
 			},
 			name: "Produce a priorityMetadata with affinity and requests",

pkg/scheduler/algorithm/priorities/node_affinity.go

@@ -83,7 +83,7 @@ func init() {
 	scheduler.RegisterPriorityMapReduceFunction(priorities.NodePreferAvoidPodsPriority, priorities.CalculateNodePreferAvoidPodsPriorityMap, nil, 10000)
 
 	// Prioritizes nodes that have labels matching NodeAffinity
-	scheduler.RegisterPriorityMapReduceFunction(priorities.NodeAffinityPriority, priorities.CalculateNodeAffinityPriorityMap, priorities.CalculateNodeAffinityPriorityReduce, 1)
+	scheduler.RegisterPriorityMapReduceFunction(priorities.NodeAffinityPriority, nil, nil, 1)
 
 	// Prioritizes nodes that marked with taint which pod can tolerate.
 	scheduler.RegisterPriorityMapReduceFunction(priorities.TaintTolerationPriority, nil, nil, 1)

pkg/scheduler/algorithm/priorities/node_affinity_test.go

@@ -47,6 +47,7 @@ filegroup(
         ":package-srcs",
         "//pkg/scheduler/framework/plugins/defaultpodtopologyspread:all-srcs",
         "//pkg/scheduler/framework/plugins/examples:all-srcs",
+        "//pkg/scheduler/framework/plugins/helper:all-srcs",
         "//pkg/scheduler/framework/plugins/imagelocality:all-srcs",
         "//pkg/scheduler/framework/plugins/interpodaffinity:all-srcs",
         "//pkg/scheduler/framework/plugins/migration:all-srcs",

pkg/scheduler/algorithmprovider/defaults/register_priorities.go

@@ -0,0 +1,30 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "go_default_library",
+    srcs = ["normalize_score.go"],
+    importpath = "k8s.io/kubernetes/pkg/scheduler/framework/plugins/helper",
+    visibility = ["//visibility:public"],
+    deps = ["//pkg/scheduler/framework/v1alpha1:go_default_library"],
+)
+
+go_test(
+    name = "go_default_test",
+    srcs = ["normalize_score_test.go"],
+    embed = [":go_default_library"],
+    deps = ["//pkg/scheduler/framework/v1alpha1:go_default_library"],
+)
+
+filegroup(
+    name = "package-srcs",
+    srcs = glob(["**"]),
+    tags = ["automanaged"],
+    visibility = ["//visibility:private"],
+)
+
+filegroup(
+    name = "all-srcs",
+    srcs = [":package-srcs"],
+    tags = ["automanaged"],
+    visibility = ["//visibility:public"],
+)