Merge pull request #117720 from kerthcet/feat/remove-selector-spread

Remove deprecated selectorSpread
kubernetes · Aug 29, 2023 · cd91351 · cd91351
2 parents 27c9d32 + 855b445
commit cd91351
Show file tree

Hide file tree

Showing 9 changed files with 4 additions and 1,201 deletions.
diff --git a/pkg/scheduler/apis/config/validation/validation.go b/pkg/scheduler/apis/config/validation/validation.go
@@ -142,7 +142,7 @@ type invalidPlugins struct {
 var invalidPluginsByVersion = []invalidPlugins{
 	{
 		schemeGroupVersion: v1.SchemeGroupVersion.String(),
-		plugins:            []string{"SelectorSpread"},
+		plugins:            []string{},
 	},
 }
 

diff --git a/pkg/scheduler/apis/config/validation/validation_test.go b/pkg/scheduler/apis/config/validation/validation_test.go
@@ -195,9 +195,6 @@ func TestValidateKubeSchedulerConfigurationV1(t *testing.T) {
 	validPlugins := validConfig.DeepCopy()
 	validPlugins.Profiles[0].Plugins.Score.Enabled = append(validPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "PodTopologySpread", Weight: 2})
 
-	invalidPlugins := validConfig.DeepCopy()
-	invalidPlugins.Profiles[0].Plugins.Score.Enabled = append(invalidPlugins.Profiles[0].Plugins.Score.Enabled, config.Plugin{Name: "SelectorSpread"})
-
 	scenarios := map[string]struct {
 		config   *config.KubeSchedulerConfiguration
 		wantErrs field.ErrorList
@@ -394,15 +391,6 @@ func TestValidateKubeSchedulerConfigurationV1(t *testing.T) {
 				},
 			},
 		},
-		"invalid-plugins": {
-			config: invalidPlugins,
-			wantErrs: field.ErrorList{
-				&field.Error{
-					Type:  field.ErrorTypeInvalid,
-					Field: "profiles[0].plugins.score.enabled[0]",
-				},
-			},
-		},
 		"valid-plugins": {
 			config: validPlugins,
 		},

diff --git a/pkg/scheduler/framework/plugins/names/names.go b/pkg/scheduler/framework/plugins/names/names.go
@@ -36,7 +36,6 @@ const (
 	GCEPDLimits                     = "GCEPDLimits"
 	PodTopologySpread               = "PodTopologySpread"
 	SchedulingGates                 = "SchedulingGates"
-	SelectorSpread                  = "SelectorSpread"
 	TaintToleration                 = "TaintToleration"
 	VolumeBinding                   = "VolumeBinding"
 	VolumeRestrictions              = "VolumeRestrictions"

diff --git a/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go b/pkg/scheduler/framework/plugins/podtopologyspread/scoring_test.go
@@ -1442,83 +1442,3 @@ func BenchmarkTestPodTopologySpreadScore(b *testing.B) {
 		})
 	}
 }
-
-// The following test allows to compare PodTopologySpread.Score with
-// SelectorSpread.Score by using a similar rule.
-// See pkg/scheduler/framework/plugins/selectorspread/selector_spread_perf_test.go
-// for the equivalent test.
-
-var (
-	tests = []struct {
-		name            string
-		existingPodsNum int
-		allNodesNum     int
-	}{
-		{
-			name:            "100nodes",
-			existingPodsNum: 1000,
-			allNodesNum:     100,
-		},
-		{
-			name:            "1000nodes",
-			existingPodsNum: 10000,
-			allNodesNum:     1000,
-		},
-		{
-			name:            "5000nodes",
-			existingPodsNum: 50000,
-			allNodesNum:     5000,
-		},
-	}
-)
-
-func BenchmarkTestDefaultEvenPodsSpreadPriority(b *testing.B) {
-	for _, tt := range tests {
-		b.Run(tt.name, func(b *testing.B) {
-			pod := st.MakePod().Name("p").Label("foo", "").Obj()
-			existingPods, allNodes, filteredNodes := st.MakeNodesAndPodsForEvenPodsSpread(pod.Labels, tt.existingPodsNum, tt.allNodesNum, tt.allNodesNum)
-			state := framework.NewCycleState()
-			snapshot := cache.NewSnapshot(existingPods, allNodes)
-			client := fake.NewSimpleClientset(
-				&v1.Service{Spec: v1.ServiceSpec{Selector: map[string]string{"foo": ""}}},
-			)
-			_, ctx := ktesting.NewTestContext(b)
-			ctx, cancel := context.WithCancel(ctx)
-			defer cancel()
-			informerFactory := informers.NewSharedInformerFactory(client, 0)
-			f, err := frameworkruntime.NewFramework(ctx, nil, nil,
-				frameworkruntime.WithSnapshotSharedLister(snapshot),
-				frameworkruntime.WithInformerFactory(informerFactory))
-			if err != nil {
-				b.Fatalf("Failed creating framework runtime: %v", err)
-			}
-			pl, err := New(&config.PodTopologySpreadArgs{DefaultingType: config.SystemDefaulting}, f, feature.Features{})
-			if err != nil {
-				b.Fatalf("Failed creating plugin: %v", err)
-			}
-			p := pl.(*PodTopologySpread)
-
-			informerFactory.Start(ctx.Done())
-			informerFactory.WaitForCacheSync(ctx.Done())
-			b.ResetTimer()
-
-			for i := 0; i < b.N; i++ {
-				status := p.PreScore(ctx, state, pod, filteredNodes)
-				if !status.IsSuccess() {
-					b.Fatalf("unexpected error: %v", status)
-				}
-				gotList := make(framework.NodeScoreList, len(filteredNodes))
-				scoreNode := func(i int) {
-					n := filteredNodes[i]
-					score, _ := p.Score(ctx, state, pod, n.Name)
-					gotList[i] = framework.NodeScore{Name: n.Name, Score: score}
-				}
-				p.parallelizer.Until(ctx, len(filteredNodes), scoreNode, "")
-				status = p.NormalizeScore(ctx, state, pod, gotList)
-				if !status.IsSuccess() {
-					b.Fatal(status)
-				}
-			}
-		})
-	}
-}
diff --git a/pkg/scheduler/framework/plugins/registry.go b/pkg/scheduler/framework/plugins/registry.go
@@ -34,7 +34,6 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/podtopologyspread"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/queuesort"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/schedulinggates"
-	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/selectorspread"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/tainttoleration"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumebinding"
 	"k8s.io/kubernetes/pkg/scheduler/framework/plugins/volumerestrictions"
@@ -61,7 +60,6 @@ func NewInTreeRegistry() runtime.Registry {
 
 	registry := runtime.Registry{
 		dynamicresources.Name:                runtime.FactoryAdapter(fts, dynamicresources.New),
-		selectorspread.Name:                  selectorspread.New,
 		imagelocality.Name:                   imagelocality.New,
 		tainttoleration.Name:                 tainttoleration.New,
 		nodename.Name:                        nodename.New,

diff --git a/pkg/scheduler/framework/plugins/selectorspread/selector_spread.go b/pkg/scheduler/framework/plugins/selectorspread/selector_spread.go