Merge pull request kubernetes#86614 from ahg-g/ahg1-default2

Deprecate scheduler predicate and priority factory registration and associated types

Author: k8s-ci-robot

pkg/scheduler/BUILD

@@ -110,7 +110,6 @@ go_test(
         "//staging/src/k8s.io/client-go/testing:go_default_library",
         "//staging/src/k8s.io/client-go/tools/cache:go_default_library",
         "//staging/src/k8s.io/client-go/tools/events:go_default_library",
-        "//vendor/github.com/google/go-cmp/cmp:go_default_library",
         "//vendor/github.com/stretchr/testify/assert:go_default_library",
     ],
 )

pkg/scheduler/algorithm_factory.go

@@ -10,14 +10,12 @@ go_library(
     name = "go_default_library",
     srcs = [
         "defaults.go",
-        "register_predicates.go",
         "register_priorities.go",
     ],
     importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults",
     deps = [
         "//pkg/features:go_default_library",
         "//pkg/scheduler:go_default_library",
-        "//pkg/scheduler/algorithm:go_default_library",
         "//pkg/scheduler/algorithm/predicates:go_default_library",
         "//pkg/scheduler/algorithm/priorities:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",

pkg/scheduler/algorithmprovider/defaults/BUILD

@@ -66,24 +66,19 @@ func ApplyFeatureGates() (restore func()) {
 	if utilfeature.DefaultFeatureGate.Enabled(features.EvenPodsSpread) {
 		klog.Infof("Registering EvenPodsSpread predicate and priority function")
 		// register predicate
-		scheduler.InsertPredicateKeyToAlgorithmProviderMap(predicates.EvenPodsSpreadPred)
-		scheduler.RegisterFitPredicate(predicates.EvenPodsSpreadPred, predicates.EvenPodsSpreadPredicate)
+		scheduler.AddPredicateToAlgorithmProviders(predicates.EvenPodsSpreadPred)
+		scheduler.RegisterPredicate(predicates.EvenPodsSpreadPred)
 		// register priority
-		scheduler.InsertPriorityKeyToAlgorithmProviderMap(priorities.EvenPodsSpreadPriority)
-		scheduler.RegisterPriorityMapReduceFunction(
-			priorities.EvenPodsSpreadPriority,
-			priorities.CalculateEvenPodsSpreadPriorityMap,
-			priorities.CalculateEvenPodsSpreadPriorityReduce,
-			1,
-		)
+		scheduler.AddPriorityToAlgorithmProviders(priorities.EvenPodsSpreadPriority)
+		scheduler.RegisterPriority(priorities.EvenPodsSpreadPriority, 1)
 	}
 
 	// Prioritizes nodes that satisfy pod's resource limits
 	if utilfeature.DefaultFeatureGate.Enabled(features.ResourceLimitsPriorityFunction) {
 		klog.Infof("Registering resourcelimits priority function")
-		scheduler.RegisterPriorityMapReduceFunction(priorities.ResourceLimitsPriority, nil, nil, 1)
+		scheduler.RegisterPriority(priorities.ResourceLimitsPriority, 1)
 		// Register the priority function to specific provider too.
-		scheduler.InsertPriorityKeyToAlgorithmProviderMap(scheduler.RegisterPriorityMapReduceFunction(priorities.ResourceLimitsPriority, nil, nil, 1))
+		scheduler.AddPriorityToAlgorithmProviders(priorities.ResourceLimitsPriority)
 	}
 
 	restore = func() {

pkg/scheduler/algorithmprovider/defaults/defaults.go

@@ -18,7 +18,6 @@ package defaults
 
 import (
 	"k8s.io/kubernetes/pkg/scheduler"
-	"k8s.io/kubernetes/pkg/scheduler/algorithm"
 	"k8s.io/kubernetes/pkg/scheduler/algorithm/priorities"
 )
 
@@ -32,62 +31,4 @@ func init() {
 			statefulSetLister := args.InformerFactory.Apps().V1().StatefulSets().Lister()
 			return priorities.NewMetadataFactory(serviceLister, controllerLister, replicaSetLister, statefulSetLister, args.HardPodAffinitySymmetricWeight)
 		})
-
-	// ServiceSpreadingPriority is a priority config factory that spreads pods by minimizing
-	// the number of pods (belonging to the same service) on the same node.
-	// Register the factory so that it's available, but do not include it as part of the default priorities
-	// Largely replaced by "SelectorSpreadPriority", but registered for backward compatibility with 1.0
-	scheduler.RegisterPriorityConfigFactory(
-		priorities.ServiceSpreadingPriority,
-		scheduler.PriorityConfigFactory{
-			MapReduceFunction: func(args scheduler.AlgorithmFactoryArgs) (priorities.PriorityMapFunction, priorities.PriorityReduceFunction) {
-				serviceLister := args.InformerFactory.Core().V1().Services().Lister()
-				return priorities.NewSelectorSpreadPriority(serviceLister, algorithm.EmptyControllerLister{}, algorithm.EmptyReplicaSetLister{}, algorithm.EmptyStatefulSetLister{})
-			},
-			Weight: 1,
-		},
-	)
-	// Optional, cluster-autoscaler friendly priority function - give used nodes higher priority.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.MostRequestedPriority, priorities.MostRequestedPriorityMap, nil, 1)
-	scheduler.RegisterPriorityMapReduceFunction(
-		priorities.RequestedToCapacityRatioPriority,
-		priorities.RequestedToCapacityRatioResourceAllocationPriorityDefault().PriorityMap,
-		nil,
-		1)
-	// spreads pods by minimizing the number of pods (belonging to the same service or replication controller) on the same node.
-	scheduler.RegisterPriorityConfigFactory(
-		priorities.SelectorSpreadPriority,
-		scheduler.PriorityConfigFactory{
-			MapReduceFunction: func(args scheduler.AlgorithmFactoryArgs) (priorities.PriorityMapFunction, priorities.PriorityReduceFunction) {
-				serviceLister := args.InformerFactory.Core().V1().Services().Lister()
-				controllerLister := args.InformerFactory.Core().V1().ReplicationControllers().Lister()
-				replicaSetLister := args.InformerFactory.Apps().V1().ReplicaSets().Lister()
-				statefulSetLister := args.InformerFactory.Apps().V1().StatefulSets().Lister()
-				return priorities.NewSelectorSpreadPriority(serviceLister, controllerLister, replicaSetLister, statefulSetLister)
-			},
-			Weight: 1,
-		},
-	)
-	// pods should be placed in the same topological domain (e.g. same node, same rack, same zone, same power domain, etc.)
-	// as some other pods, or, conversely, should not be placed in the same topological domain as some other pods.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.InterPodAffinityPriority, nil, nil, 1)
-
-	// Prioritize nodes by least requested utilization.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.LeastRequestedPriority, priorities.LeastRequestedPriorityMap, nil, 1)
-
-	// Prioritizes nodes to help achieve balanced resource usage
-	scheduler.RegisterPriorityMapReduceFunction(priorities.BalancedResourceAllocation, priorities.BalancedResourceAllocationMap, nil, 1)
-
-	// 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, nil, nil, 10000)
-
-	// Prioritizes nodes that have labels matching NodeAffinity
-	scheduler.RegisterPriorityMapReduceFunction(priorities.NodeAffinityPriority, nil, nil, 1)
-
-	// Prioritizes nodes that marked with taint which pod can tolerate.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.TaintTolerationPriority, nil, nil, 1)
-
-	// ImageLocalityPriority prioritizes nodes that have images requested by the pod present.
-	scheduler.RegisterPriorityMapReduceFunction(priorities.ImageLocalityPriority, nil, nil, 1)
 }

pkg/scheduler/algorithmprovider/defaults/register_predicates.go

@@ -17,7 +17,6 @@ limitations under the License.
 package algorithmprovider
 
 import (
-	"fmt"
 	"testing"
 
 	"k8s.io/kubernetes/pkg/scheduler"
@@ -30,47 +29,6 @@ var (
 	}
 )
 
-func TestDefaultConfigExists(t *testing.T) {
-	p, err := scheduler.GetAlgorithmProvider(schedulerapi.SchedulerDefaultProviderName)
-	if err != nil {
-		t.Errorf("error retrieving default provider: %v", err)
-	}
-	if p == nil {
-		t.Error("algorithm provider config should not be nil")
-	}
-	if len(p.FitPredicateKeys) == 0 {
-		t.Error("default algorithm provider shouldn't have 0 fit predicates")
-	}
-}
-
-func TestAlgorithmProviders(t *testing.T) {
-	for _, pn := range algorithmProviderNames {
-		t.Run(pn, func(t *testing.T) {
-			p, err := scheduler.GetAlgorithmProvider(pn)
-			if err != nil {
-				t.Fatalf("error retrieving provider: %v", err)
-			}
-			if len(p.PriorityFunctionKeys) == 0 {
-				t.Errorf("algorithm provider shouldn't have 0 priority functions")
-			}
-			for _, pf := range p.PriorityFunctionKeys.List() {
-				t.Run(fmt.Sprintf("priorityfunction/%s", pf), func(t *testing.T) {
-					if !scheduler.IsPriorityFunctionRegistered(pf) {
-						t.Errorf("priority function is not registered but is used in the algorithm provider")
-					}
-				})
-			}
-			for _, fp := range p.FitPredicateKeys.List() {
-				t.Run(fmt.Sprintf("fitpredicate/%s", fp), func(t *testing.T) {
-					if !scheduler.IsFitPredicateRegistered(fp) {
-						t.Errorf("fit predicate is not registered but is used in the algorithm provider")
-					}
-				})
-			}
-		})
-	}
-}
-
 func TestApplyFeatureGates(t *testing.T) {
 	for _, pn := range algorithmProviderNames {
 		t.Run(pn, func(t *testing.T) {
@@ -79,7 +37,7 @@ func TestApplyFeatureGates(t *testing.T) {
 				t.Fatalf("Error retrieving provider: %v", err)
 			}
 
-			if !p.FitPredicateKeys.Has("PodToleratesNodeTaints") {
+			if !p.PredicateKeys.Has("PodToleratesNodeTaints") {
 				t.Fatalf("Failed to find predicate: 'PodToleratesNodeTaints'")
 			}
 		})
@@ -94,7 +52,7 @@ func TestApplyFeatureGates(t *testing.T) {
 				t.Fatalf("Error retrieving '%s' provider: %v", pn, err)
 			}
 
-			if !p.FitPredicateKeys.Has("PodToleratesNodeTaints") {
+			if !p.PredicateKeys.Has("PodToleratesNodeTaints") {
 				t.Fatalf("Failed to find predicate: 'PodToleratesNodeTaints'")
 			}
 		})

pkg/scheduler/algorithmprovider/defaults/register_priorities.go

@@ -18,7 +18,6 @@ go_test(
         "//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",
-        "//staging/src/k8s.io/apimachinery/pkg/util/sets:go_default_library",
         "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
         "//staging/src/k8s.io/client-go/informers:go_default_library",
         "//staging/src/k8s.io/client-go/kubernetes/fake:go_default_library",