From 3b8f25dfdd98683ec8f0440741e4c97f19cdec77 Mon Sep 17 00:00:00 2001 From: Kensei Nakada Date: Wed, 13 Dec 2023 03:59:48 +0000 Subject: [PATCH] fix: disable SchedulerQueueingHints feature flag by default --- pkg/features/kube_features.go | 2 +- pkg/scheduler/internal/queue/scheduling_queue_test.go | 2 ++ test/integration/scheduler/queue_test.go | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 21990f2919a..edd33feb74d 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -1176,7 +1176,7 @@ var defaultKubernetesFeatureGates = map[featuregate.Feature]featuregate.FeatureS ElasticIndexedJob: {Default: true, PreRelease: featuregate.Beta}, - SchedulerQueueingHints: {Default: true, PreRelease: featuregate.Beta}, + SchedulerQueueingHints: {Default: false, PreRelease: featuregate.Beta}, SecurityContextDeny: {Default: false, PreRelease: featuregate.Alpha}, diff --git a/pkg/scheduler/internal/queue/scheduling_queue_test.go b/pkg/scheduler/internal/queue/scheduling_queue_test.go index 9efbe382e50..0f1c2a40c51 100644 --- a/pkg/scheduler/internal/queue/scheduling_queue_test.go +++ b/pkg/scheduler/internal/queue/scheduling_queue_test.go @@ -1363,6 +1363,8 @@ func TestPriorityQueue_MoveAllToActiveOrBackoffQueue(t *testing.T) { ctx, cancel := context.WithCancel(ctx) defer cancel() m := makeEmptyQueueingHintMapPerProfile() + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SchedulerQueueingHints, true)() + m[""][NodeAdd] = []*QueueingHintFunction{ { PluginName: "fooPlugin", diff --git a/test/integration/scheduler/queue_test.go b/test/integration/scheduler/queue_test.go index 789dc1ce217..42535552916 100644 --- a/test/integration/scheduler/queue_test.go +++ b/test/integration/scheduler/queue_test.go @@ -536,6 +536,7 @@ func (p *firstFailBindPlugin) Bind(ctx context.Context, state *framework.CycleSt // TestRequeueByPermitRejection verify Pods failed by permit plugins in the binding cycle are // put back to the queue, according to the correct scheduling cycle number. func TestRequeueByPermitRejection(t *testing.T) { + defer featuregatetesting.SetFeatureGateDuringTest(t, utilfeature.DefaultFeatureGate, features.SchedulerQueueingHints, true)() queueingHintCalledCounter := 0 fakePermit := &fakePermitPlugin{} registry := frameworkruntime.Registry{