Merge pull request kubernetes#86684 from Huang-Wei/eps-move-prio

Move podtopologyspread priority logic to its Score plugin

Author: k8s-ci-robot

pkg/scheduler/algorithm/priorities/BUILD

@@ -10,7 +10,6 @@ go_library(
     name = "go_default_library",
     srcs = [
         "balanced_resource_allocation.go",
-        "even_pods_spread.go",
         "least_requested.go",
         "metadata.go",
         "most_requested.go",
@@ -26,7 +25,6 @@ go_library(
     deps = [
         "//pkg/apis/core/v1/helper:go_default_library",
         "//pkg/features:go_default_library",
-        "//pkg/scheduler/algorithm/predicates:go_default_library",
         "//pkg/scheduler/algorithm/priorities/util:go_default_library",
         "//pkg/scheduler/framework/v1alpha1:go_default_library",
         "//pkg/scheduler/listers:go_default_library",
@@ -39,7 +37,6 @@ go_library(
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/listers/apps/v1:go_default_library",
         "//staging/src/k8s.io/client-go/listers/core/v1:go_default_library",
-        "//staging/src/k8s.io/client-go/util/workqueue:go_default_library",
         "//vendor/k8s.io/klog:go_default_library",
     ],
 )
@@ -48,7 +45,6 @@ go_test(
     name = "go_default_test",
     srcs = [
         "balanced_resource_allocation_test.go",
-        "even_pods_spread_test.go",
         "least_requested_test.go",
         "metadata_test.go",
         "most_requested_test.go",

pkg/scheduler/algorithm/priorities/even_pods_spread.go

@@ -22,9 +22,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	appslisters "k8s.io/client-go/listers/apps/v1"
 	corelisters "k8s.io/client-go/listers/core/v1"
-	"k8s.io/klog"
 	schedulerlisters "k8s.io/kubernetes/pkg/scheduler/listers"
-	schedulernodeinfo "k8s.io/kubernetes/pkg/scheduler/nodeinfo"
 )
 
 // MetadataFactory is a factory to produce PriorityMetadata.
@@ -56,8 +54,7 @@ func NewMetadataFactory(
 
 // priorityMetadata is a type that is passed as metadata for priority functions
 type priorityMetadata struct {
-	podSelector          labels.Selector
-	podTopologySpreadMap *podTopologySpreadMap
+	podSelector labels.Selector
 }
 
 // PriorityMetadata is a MetadataProducer.  Node info can be nil.
@@ -70,20 +67,8 @@ func (pmf *MetadataFactory) PriorityMetadata(
 	if pod == nil {
 		return nil
 	}
-	var allNodes []*schedulernodeinfo.NodeInfo
-	if sharedLister != nil {
-		if l, err := sharedLister.NodeInfos().List(); err == nil {
-			allNodes = l
-		}
-	}
-	tpSpreadMap, err := buildPodTopologySpreadMap(pod, filteredNodes, allNodes)
-	if err != nil {
-		klog.Errorf("Error building podTopologySpreadMap: %v", err)
-		return nil
-	}
 	return &priorityMetadata{
-		podSelector:          getSelector(pod, pmf.serviceLister, pmf.controllerLister, pmf.replicaSetLister, pmf.statefulSetLister),
-		podTopologySpreadMap: tpSpreadMap,
+		podSelector: getSelector(pod, pmf.serviceLister, pmf.controllerLister, pmf.replicaSetLister, pmf.statefulSetLister),
 	}
 }
 

pkg/scheduler/algorithm/priorities/metadata.go

@@ -20,7 +20,6 @@ import (
 	"testing"
 
 	v1 "k8s.io/api/core/v1"
-	framework "k8s.io/kubernetes/pkg/scheduler/framework/v1alpha1"
 	"k8s.io/kubernetes/pkg/scheduler/listers/fake"
 	nodeinfosnapshot "k8s.io/kubernetes/pkg/scheduler/nodeinfo/snapshot"
 	st "k8s.io/kubernetes/pkg/scheduler/testing"
@@ -48,41 +47,6 @@ var (
 	}
 )
 
-func BenchmarkTestDefaultEvenPodsSpreadPriority(b *testing.B) {
-	for _, tt := range tests {
-		b.Run(tt.name, func(b *testing.B) {
-			pod := st.MakePod().Name("p").Label("foo", "").
-				SpreadConstraint(1, v1.LabelHostname, softSpread, st.MakeLabelSelector().Exists("foo").Obj()).
-				SpreadConstraint(1, v1.LabelZoneFailureDomain, softSpread, st.MakeLabelSelector().Exists("foo").Obj()).Obj()
-			existingPods, allNodes, filteredNodes := st.MakeNodesAndPodsForEvenPodsSpread(pod.Labels, tt.existingPodsNum, tt.allNodesNum, tt.allNodesNum)
-			snapshot := nodeinfosnapshot.NewSnapshot(nodeinfosnapshot.CreateNodeInfoMap(existingPods, allNodes))
-			b.ResetTimer()
-
-			for i := 0; i < b.N; i++ {
-				tpSpreadMap, err := buildPodTopologySpreadMap(pod, filteredNodes, snapshot.NodeInfoList)
-				if err != nil {
-					b.Fatal(err)
-				}
-				meta := &priorityMetadata{
-					podTopologySpreadMap: tpSpreadMap,
-				}
-				var gotList framework.NodeScoreList
-				for _, n := range filteredNodes {
-					score, err := CalculateEvenPodsSpreadPriorityMap(pod, meta, snapshot.NodeInfoMap[n.Name])
-					if err != nil {
-						b.Fatal(err)
-					}
-					gotList = append(gotList, score)
-				}
-				err = CalculateEvenPodsSpreadPriorityReduce(pod, meta, snapshot, gotList)
-				if err != nil {
-					b.Fatal(err)
-				}
-			}
-		})
-	}
-}
-
 func BenchmarkTestSelectorSpreadPriority(b *testing.B) {
 	for _, tt := range tests {
 		b.Run(tt.name, func(b *testing.B) {