deprecate ResourceLimitsPriorityFunction feature gate in the scheduler

Signed-off-by: SataQiu <1527062125@qq.com>

pkg/scheduler/algorithmprovider/BUILD

@@ -11,7 +11,6 @@ go_library(
     srcs = ["registry.go"],
     importpath = "k8s.io/kubernetes/pkg/scheduler/algorithmprovider",
     deps = [
-        "//pkg/features:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
         "//pkg/scheduler/framework/plugins/defaultbinder:go_default_library",
         "//pkg/scheduler/framework/plugins/defaultpodtopologyspread:go_default_library",
@@ -30,8 +29,6 @@ go_library(
         "//pkg/scheduler/framework/plugins/volumebinding:go_default_library",
         "//pkg/scheduler/framework/plugins/volumerestrictions:go_default_library",
         "//pkg/scheduler/framework/plugins/volumezone:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//vendor/k8s.io/klog/v2:go_default_library",
     ],
 )
 
@@ -40,7 +37,6 @@ go_test(
     srcs = ["registry_test.go"],
     embed = [":go_default_library"],
     deps = [
-        "//pkg/features:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
         "//pkg/scheduler/framework/plugins/defaultbinder:go_default_library",
         "//pkg/scheduler/framework/plugins/defaultpodtopologyspread:go_default_library",
@@ -59,8 +55,6 @@ go_test(
         "//pkg/scheduler/framework/plugins/volumebinding:go_default_library",
         "//pkg/scheduler/framework/plugins/volumerestrictions:go_default_library",
         "//pkg/scheduler/framework/plugins/volumezone:go_default_library",
-        "//staging/src/k8s.io/apiserver/pkg/util/feature:go_default_library",
-        "//staging/src/k8s.io/component-base/featuregate/testing:go_default_library",
         "//vendor/github.com/google/go-cmp/cmp:go_default_library",
     ],
 )

pkg/scheduler/algorithmprovider/registry.go

@@ -20,9 +20,6 @@ import (
 	"sort"
 	"strings"
 
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	"k8s.io/klog/v2"
-	"k8s.io/kubernetes/pkg/features"
 	schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpodtopologyspread"
@@ -52,10 +49,7 @@ type Registry map[string]*schedulerapi.Plugins
 // NewRegistry returns an algorithm provider registry instance.
 func NewRegistry() Registry {
 	defaultConfig := getDefaultConfig()
-	applyFeatureGates(defaultConfig)
-
 	caConfig := getClusterAutoscalerConfig()
-	applyFeatureGates(caConfig)
 
 	return Registry{
 		schedulerapi.SchedulerDefaultProviderName: defaultConfig,
@@ -170,14 +164,3 @@ func getClusterAutoscalerConfig() *schedulerapi.Plugins {
 	}
 	return caConfig
 }
-
-func applyFeatureGates(config *schedulerapi.Plugins) {
-	// Prioritizes nodes that satisfy pod's resource limits
-	if utilfeature.DefaultFeatureGate.Enabled(features.ResourceLimitsPriorityFunction) {
-		klog.Infof("Registering resourcelimits priority function")
-		s := schedulerapi.Plugin{Name: noderesources.ResourceLimitsName}
-		config.PreScore.Enabled = append(config.PreScore.Enabled, s)
-		s = schedulerapi.Plugin{Name: noderesources.ResourceLimitsName, Weight: 1}
-		config.Score.Enabled = append(config.Score.Enabled, s)
-	}
-}

pkg/scheduler/algorithmprovider/registry_test.go

@@ -21,9 +21,6 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
-	utilfeature "k8s.io/apiserver/pkg/util/feature"
-	featuregatetesting "k8s.io/component-base/featuregate/testing"
-	"k8s.io/kubernetes/pkg/features"
 	schedulerapi "k8s.io/kubernetes/pkg/scheduler/apis/config"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultbinder"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/defaultpodtopologyspread"
@@ -132,194 +129,3 @@ func TestClusterAutoscalerProvider(t *testing.T) {
 		t.Errorf("unexpected config diff (-want, +got): %s", diff)
 	}
 }
-
-func TestApplyFeatureGates(t *testing.T) {
-	tests := []struct {
-		name            string
-		featuresEnabled bool
-		wantConfig      *schedulerapi.Plugins
-	}{
-		{
-			name:            "Feature gates disabled",
-			featuresEnabled: false,
-			wantConfig: &schedulerapi.Plugins{
-				QueueSort: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: queuesort.Name},
-					},
-				},
-				PreFilter: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: noderesources.FitName},
-						{Name: nodeports.Name},
-						{Name: podtopologyspread.Name},
-						{Name: interpodaffinity.Name},
-					},
-				},
-				Filter: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: nodeunschedulable.Name},
-						{Name: noderesources.FitName},
-						{Name: nodename.Name},
-						{Name: nodeports.Name},
-						{Name: nodeaffinity.Name},
-						{Name: volumerestrictions.Name},
-						{Name: tainttoleration.Name},
-						{Name: nodevolumelimits.EBSName},
-						{Name: nodevolumelimits.GCEPDName},
-						{Name: nodevolumelimits.CSIName},
-						{Name: nodevolumelimits.AzureDiskName},
-						{Name: volumebinding.Name},
-						{Name: volumezone.Name},
-						{Name: podtopologyspread.Name},
-						{Name: interpodaffinity.Name},
-					},
-				},
-				PreScore: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: interpodaffinity.Name},
-						{Name: podtopologyspread.Name},
-						{Name: defaultpodtopologyspread.Name},
-						{Name: tainttoleration.Name},
-					},
-				},
-				Score: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: noderesources.BalancedAllocationName, Weight: 1},
-						{Name: imagelocality.Name, Weight: 1},
-						{Name: interpodaffinity.Name, Weight: 1},
-						{Name: noderesources.LeastAllocatedName, Weight: 1},
-						{Name: nodeaffinity.Name, Weight: 1},
-						{Name: nodepreferavoidpods.Name, Weight: 10000},
-						{Name: podtopologyspread.Name, Weight: 2},
-						{Name: defaultpodtopologyspread.Name, Weight: 1},
-						{Name: tainttoleration.Name, Weight: 1},
-					},
-				},
-				Reserve: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				Unreserve: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				PreBind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				Bind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: defaultbinder.Name},
-					},
-				},
-				PostBind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-			},
-		},
-		{
-			name:            "Feature gates enabled",
-			featuresEnabled: true,
-			wantConfig: &schedulerapi.Plugins{
-				QueueSort: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: queuesort.Name},
-					},
-				},
-				PreFilter: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: noderesources.FitName},
-						{Name: nodeports.Name},
-						{Name: podtopologyspread.Name},
-						{Name: interpodaffinity.Name},
-					},
-				},
-				Filter: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: nodeunschedulable.Name},
-						{Name: noderesources.FitName},
-						{Name: nodename.Name},
-						{Name: nodeports.Name},
-						{Name: nodeaffinity.Name},
-						{Name: volumerestrictions.Name},
-						{Name: tainttoleration.Name},
-						{Name: nodevolumelimits.EBSName},
-						{Name: nodevolumelimits.GCEPDName},
-						{Name: nodevolumelimits.CSIName},
-						{Name: nodevolumelimits.AzureDiskName},
-						{Name: volumebinding.Name},
-						{Name: volumezone.Name},
-						{Name: podtopologyspread.Name},
-						{Name: interpodaffinity.Name},
-					},
-				},
-				PreScore: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: interpodaffinity.Name},
-						{Name: podtopologyspread.Name},
-						{Name: defaultpodtopologyspread.Name},
-						{Name: tainttoleration.Name},
-						{Name: noderesources.ResourceLimitsName},
-					},
-				},
-				Score: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: noderesources.BalancedAllocationName, Weight: 1},
-						{Name: imagelocality.Name, Weight: 1},
-						{Name: interpodaffinity.Name, Weight: 1},
-						{Name: noderesources.LeastAllocatedName, Weight: 1},
-						{Name: nodeaffinity.Name, Weight: 1},
-						{Name: nodepreferavoidpods.Name, Weight: 10000},
-						{Name: podtopologyspread.Name, Weight: 2},
-						{Name: defaultpodtopologyspread.Name, Weight: 1},
-						{Name: tainttoleration.Name, Weight: 1},
-						{Name: noderesources.ResourceLimitsName, Weight: 1},
-					},
-				},
-				Reserve: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				Unreserve: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				PreBind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-				Bind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: defaultbinder.Name},
-					},
-				},
-				PostBind: &schedulerapi.PluginSet{
-					Enabled: []schedulerapi.Plugin{
-						{Name: volumebinding.Name},
-					},
-				},
-			},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.ResourceLimitsPriorityFunction, test.featuresEnabled)()
-
-			r := NewRegistry()
-			gotConfig := r[schedulerapi.SchedulerDefaultProviderName]
-			if diff := cmp.Diff(test.wantConfig, gotConfig); diff != "" {
-				t.Errorf("unexpected config diff (-want, +got): %s", diff)
-			}
-		})
-	}
-}