Merge pull request #84190 from notpad/bug/84161

Apply feature gates in scheduler policy api compatibility test

pkg/scheduler/api/compatibility/BUILD

@@ -5,7 +5,9 @@ go_test(
     srcs = ["compatibility_test.go"],
     deps = [
         "//pkg/apis/core/install:go_default_library",
+        "//pkg/features:go_default_library",
         "//pkg/scheduler:go_default_library",
+        "//pkg/scheduler/algorithmprovider:go_default_library",
         "//pkg/scheduler/algorithmprovider/defaults:go_default_library",
         "//pkg/scheduler/api:go_default_library",
         "//pkg/scheduler/apis/config:go_default_library",
@@ -13,8 +15,11 @@ 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/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",
+        "//staging/src/k8s.io/component-base/featuregate: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/api/compatibility/compatibility_test.go

@@ -24,10 +24,15 @@ import (
 	v1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
+	utilfeature "k8s.io/apiserver/pkg/util/feature"
 	"k8s.io/client-go/informers"
 	"k8s.io/client-go/kubernetes/fake"
+	"k8s.io/component-base/featuregate"
+	featuregatetesting "k8s.io/component-base/featuregate/testing"
 	_ "k8s.io/kubernetes/pkg/apis/core/install"
+	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/scheduler"
+	"k8s.io/kubernetes/pkg/scheduler/algorithmprovider"
 	_ "k8s.io/kubernetes/pkg/scheduler/algorithmprovider/defaults"
 	schedulerapi "k8s.io/kubernetes/pkg/scheduler/api"
 	kubeschedulerconfig "k8s.io/kubernetes/pkg/scheduler/apis/config"
@@ -35,21 +40,23 @@ import (
 	"k8s.io/kubernetes/pkg/scheduler/core"
 )
 
-func TestCompatibility_v1_Scheduler(t *testing.T) {
+type testCase struct {
-	snapshot := scheduler.RegisteredPredicatesAndPrioritiesSnapshot()
+	name             string
-	defer scheduler.ApplyPredicatesAndPriorities(snapshot)
+	JSON             string
+	featureGates     map[featuregate.Feature]bool
+	wantPredicates   sets.String
+	wantPrioritizers sets.String
+	wantPlugins      map[string][]kubeschedulerconfig.Plugin
+	wantExtenders    []schedulerapi.ExtenderConfig
+}
 
+func TestCompatibility_v1_Scheduler(t *testing.T) {
 	// Add serialized versions of scheduler config that exercise available options to ensure compatibility between releases
-	schedulerFiles := map[string]struct {
+	testcases := []testCase{
-		JSON             string
-		wantPredicates   sets.String
-		wantPrioritizers sets.String
-		wantPlugins      map[string][]kubeschedulerconfig.Plugin
-		wantExtenders    []schedulerapi.ExtenderConfig
-	}{
 		// This is a special test for the "composite" predicate "GeneralPredicate". GeneralPredicate is a combination
 		// of predicates, and here we test that if given, it is mapped to the set of plugins that should be executed.
-		"GeneralPredicate": {
+		{
+			name: "GeneralPredicate",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -72,7 +79,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.0": {
+		{
+			name: "1.0",
 			JSON: `{
   "kind": "Policy",
   "apiVersion": "v1",
@@ -116,7 +124,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.1": {
+		{
+			name: "1.1",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -163,10 +172,10 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 				},
 			},
 		},
-
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.2": {
+		{
+			name: "1.2",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -228,7 +237,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.3": {
+		{
+			name: "1.3",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -293,7 +303,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.4": {
+		{
+			name: "1.4",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -361,7 +372,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.7": {
+		{
+			name: "1.7",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -450,7 +462,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.8": {
+		{
+			name: "1.8",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -539,7 +552,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.9": {
+		{
+			name: "1.9",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -631,7 +645,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.10": {
+		{
+			name: "1.10",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -726,7 +741,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.11": {
+		{
+			name: "1.11",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -833,7 +849,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		},
 		// Do not change this JSON after the corresponding release has been tagged.
 		// A failure indicates backwards compatibility with the specified release was broken.
-		"1.12": {
+		{
+			name: "1.12",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -940,7 +957,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 				Ignorable:        true,
 			}},
 		},
-		"1.14": {
+		{
+			name: "1.14",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -1049,7 +1067,8 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 				Ignorable:        true,
 			}},
 		},
-		"1.16": {
+		{
+			name: "1.16",
 			JSON: `{
 		  "kind": "Policy",
 		  "apiVersion": "v1",
@@ -1162,6 +1181,56 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 				Ignorable:        true,
 			}},
 		},
+		{
+			name: "enable alpha feature EvenPodsSpread",
+			JSON: `{
+		  "kind": "Policy",
+		  "apiVersion": "v1",
+		  "predicates": [
+			{"name": "EvenPodsSpread"}
+		  ],
+		  "priorities": [
+			{"name": "EvenPodsSpreadPriority",   "weight": 2}
+		  ]
+		}`,
+			featureGates: map[featuregate.Feature]bool{
+				features.EvenPodsSpread: true,
+			},
+			wantPrioritizers: sets.NewString(
+				"EvenPodsSpreadPriority",
+			),
+			wantPlugins: map[string][]kubeschedulerconfig.Plugin{
+				"FilterPlugin": {
+					{Name: "NodeUnschedulable"},
+					{Name: "TaintToleration"},
+					{Name: "PodTopologySpread"},
+				},
+			},
+		},
+		{
+			name: "disable beta feature AttachVolumeLimit",
+			JSON: `{
+		  "kind": "Policy",
+		  "apiVersion": "v1",
+		  "predicates": [
+			{"name": "MaxCSIVolumeCountPred"},
+			{"name": "CheckVolumeBinding"}
+		  ],		  
+		  "priorities": [
+		  ]
+		}`,
+			featureGates: map[featuregate.Feature]bool{
+				features.AttachVolumeLimit: false,
+			},
+			wantPlugins: map[string][]kubeschedulerconfig.Plugin{
+				"FilterPlugin": {
+					{Name: "NodeUnschedulable"},
+					{Name: "TaintToleration"},
+					{Name: "NodeVolumeLimits"},
+					{Name: "VolumeBinding"},
+				},
+			},
+		},
 	}
 	registeredPredicates := sets.NewString(scheduler.ListRegisteredFitPredicates()...)
 	registeredPriorities := sets.NewString(scheduler.ListRegisteredPriorityFunctions()...)
@@ -1185,6 +1254,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		"AzureDiskLimits":    "MaxAzureDiskVolumeCount",
 		"CinderLimits":       "MaxCinderVolumeCount",
 		"InterPodAffinity":   "MatchInterPodAffinity",
+		"PodTopologySpread":  "EvenPodsSpread",
 	}
 	scoreToPriorityMap := map[string]string{
 		"ImageLocality":                   "ImageLocalityPriority",
@@ -1196,8 +1266,16 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 		"NodeResourcesMostAllocated":      "MostRequestedPriority",
 	}
 
-	for v, tc := range schedulerFiles {
+	for _, tc := range testcases {
-		t.Run(v, func(t *testing.T) {
+		t.Run(tc.name, func(t *testing.T) {
+			for feature, value := range tc.featureGates {
+				defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, feature, value)()
+			}
+			defer algorithmprovider.ApplyFeatureGates()()
+			if len(tc.featureGates) > 0 {
+				// The enabled featuregate can register more predicates
+				registeredPredicates = registeredPredicates.Union(sets.NewString(scheduler.ListRegisteredFitPredicates()...))
+			}
 			policyConfigMap := v1.ConfigMap{
 				ObjectMeta: metav1.ObjectMeta{Namespace: metav1.NamespaceSystem, Name: "scheduler-custom-policy-config"},
 				Data:       map[string]string{schedulerconfig.SchedulerPolicyConfigMapKey: tc.JSON},
@@ -1223,7 +1301,7 @@ func TestCompatibility_v1_Scheduler(t *testing.T) {
 			)
 
 			if err != nil {
-				t.Fatalf("%s: Error constructing: %v", v, err)
+				t.Fatalf("Error constructing: %v", err)
 			}
 			gotPredicates := sets.NewString()
 			for p := range sched.Algorithm.Predicates() {