diff --git a/pkg/features/versioned_kube_features.go b/pkg/features/versioned_kube_features.go index d7679b94dbf..aaadd489c01 100644 --- a/pkg/features/versioned_kube_features.go +++ b/pkg/features/versioned_kube_features.go @@ -635,14 +635,14 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate {Version: version.MustParse("1.29"), Default: false, PreRelease: featuregate.Alpha}, }, - SchedulerQueueingHints: { - {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Beta}, - }, - SchedulerAsyncPreemption: { {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha}, }, + SchedulerQueueingHints: { + {Version: version.MustParse("1.28"), Default: false, PreRelease: featuregate.Beta}, + }, + SELinuxChangePolicy: { {Version: version.MustParse("1.32"), Default: false, PreRelease: featuregate.Alpha}, }, diff --git a/pkg/scheduler/framework/preemption/preemption.go b/pkg/scheduler/framework/preemption/preemption.go index 5aabf6f951d..4abb6b88719 100644 --- a/pkg/scheduler/framework/preemption/preemption.go +++ b/pkg/scheduler/framework/preemption/preemption.go @@ -471,7 +471,7 @@ func (ev *Evaluator) prepareCandidate(ctx context.Context, c Candidate, pod *v1. func (ev *Evaluator) prepareCandidateAsync(c Candidate, pod *v1.Pod, pluginName string) { metrics.PreemptionVictims.Observe(float64(len(c.Victims().Pods))) - // intentionally create a new context, not using a ctx from the scheduling cycle, to create ctx, + // Intentionally create a new context, not using a ctx from the scheduling cycle, to create ctx, // because this process could continue even after this scheduling cycle finishes. ctx, cancel := context.WithCancel(context.Background()) errCh := parallelize.NewErrorChannel() diff --git a/pkg/scheduler/metrics/metrics.go b/pkg/scheduler/metrics/metrics.go index 954b61aa88b..7fc649793b7 100644 --- a/pkg/scheduler/metrics/metrics.go +++ b/pkg/scheduler/metrics/metrics.go @@ -114,6 +114,7 @@ var ( CacheSize *metrics.GaugeVec unschedulableReasons *metrics.GaugeVec PluginEvaluationTotal *metrics.CounterVec + // The below two are only available when the QHint feature gate is enabled. queueingHintExecutionDuration *metrics.HistogramVec SchedulerQueueIncomingPods *metrics.CounterVec @@ -330,6 +331,7 @@ func InitMetrics() { Help: "Number of attempts to schedule pods by each plugin and the extension point (available only in PreFilter, Filter, PreScore, and Score).", StabilityLevel: metrics.ALPHA, }, []string{"plugin", "extension_point", "profile"}) + PreemptionGoroutinesDuration = metrics.NewHistogramVec( &metrics.HistogramOpts{ Subsystem: SchedulerSubsystem, @@ -338,8 +340,8 @@ func InitMetrics() { Buckets: metrics.ExponentialBuckets(0.01, 2, 20), StabilityLevel: metrics.ALPHA, }, - []string{"result"}, - ) + []string{"result"}) + PreemptionGoroutinesExecutionTotal = metrics.NewCounterVec( &metrics.CounterOpts{ Subsystem: SchedulerSubsystem,