mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-08-01 07:47:56 +00:00
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.
This commit is contained in:
parent
bc74476bdb
commit
d66330609c
@ -39,10 +39,8 @@ import (
|
|||||||
basecompatibility "k8s.io/component-base/compatibility"
|
basecompatibility "k8s.io/component-base/compatibility"
|
||||||
componentbaseconfig "k8s.io/component-base/config"
|
componentbaseconfig "k8s.io/component-base/config"
|
||||||
"k8s.io/component-base/featuregate"
|
"k8s.io/component-base/featuregate"
|
||||||
featuregatetesting "k8s.io/component-base/featuregate/testing"
|
|
||||||
configv1 "k8s.io/kube-scheduler/config/v1"
|
configv1 "k8s.io/kube-scheduler/config/v1"
|
||||||
"k8s.io/kubernetes/cmd/kube-scheduler/app/options"
|
"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"
|
||||||
"k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults"
|
"k8s.io/kubernetes/pkg/scheduler/apis/config/testing/defaults"
|
||||||
"k8s.io/kubernetes/pkg/scheduler/framework"
|
"k8s.io/kubernetes/pkg/scheduler/framework"
|
||||||
@ -222,19 +220,6 @@ leaderElection:
|
|||||||
wantErr bool
|
wantErr bool
|
||||||
wantFeaturesGates map[string]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",
|
name: "component configuration v1 with only scheduler name configured",
|
||||||
flags: []string{
|
flags: []string{
|
||||||
@ -435,9 +420,6 @@ leaderElection:
|
|||||||
|
|
||||||
for _, tc := range testcases {
|
for _, tc := range testcases {
|
||||||
t.Run(tc.name, func(t *testing.T) {
|
t.Run(tc.name, func(t *testing.T) {
|
||||||
for k, v := range tc.restoreFeatures {
|
|
||||||
featuregatetesting.SetFeatureGateDuringTest(t, feature.DefaultFeatureGate, k, v)
|
|
||||||
}
|
|
||||||
componentGlobalsRegistry := basecompatibility.NewComponentGlobalsRegistry()
|
componentGlobalsRegistry := basecompatibility.NewComponentGlobalsRegistry()
|
||||||
verKube := basecompatibility.NewEffectiveVersionFromString("1.32", "1.31", "1.31")
|
verKube := basecompatibility.NewEffectiveVersionFromString("1.32", "1.31", "1.31")
|
||||||
fg := feature.DefaultFeatureGate.DeepCopy()
|
fg := feature.DefaultFeatureGate.DeepCopy()
|
||||||
|
Loading…
Reference in New Issue
Block a user