From d66330609c3ba555fde79bc72828c8f989e4dacd Mon Sep 17 00:00:00 2001 From: Yuma Ogami Date: Wed, 19 Feb 2025 11:05:08 +0000 Subject: [PATCH] Remove the not-even alpha feature setting Remove the setting for the feature gate that are not even alpha because Compatibility Versions (KEP-4330) don't allow it. --- cmd/kube-scheduler/app/server_test.go | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/cmd/kube-scheduler/app/server_test.go b/cmd/kube-scheduler/app/server_test.go index dacc62825b1..6ce3644f22a 100644 --- a/cmd/kube-scheduler/app/server_test.go +++ b/cmd/kube-scheduler/app/server_test.go @@ -39,10 +39,8 @@ import ( basecompatibility "k8s.io/component-base/compatibility" componentbaseconfig "k8s.io/component-base/config" "k8s.io/component-base/featuregate" - featuregatetesting "k8s.io/component-base/featuregate/testing" configv1 "k8s.io/kube-scheduler/config/v1" "k8s.io/kubernetes/cmd/kube-scheduler/app/options" - "k8s.io/kubernetes/pkg/features" "k8s.io/kubernetes/pkg/scheduler/apis/config" "k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults" "k8s.io/kubernetes/pkg/scheduler/framework" @@ -222,19 +220,6 @@ leaderElection: wantErr bool wantFeaturesGates map[string]bool }{ - { - name: "default config with an alpha feature enabled", - flags: []string{ - "--kubeconfig", configKubeconfig, - "--feature-gates=StorageCapacityScoring=true", - }, - wantPlugins: map[string]*config.Plugins{ - "default-scheduler": defaults.ExpandedPluginsV1, - }, - restoreFeatures: map[featuregate.Feature]bool{ - features.StorageCapacityScoring: false, - }, - }, { name: "component configuration v1 with only scheduler name configured", flags: []string{ @@ -435,9 +420,6 @@ leaderElection: for _, tc := range testcases { t.Run(tc.name, func(t *testing.T) { - for k, v := range tc.restoreFeatures { - featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, k, v) - } componentGlobalsRegistry := basecompatibility.NewComponentGlobalsRegistry() verKube := basecompatibility.NewEffectiveVersionFromString("1.32", "1.31", "1.31") fg := feature.DefaultFeatureGate.DeepCopy()