diff --git a/keps/2724-topology-aware-scheduling/README.md b/keps/2724-topology-aware-scheduling/README.md index e12a496e2d9..421c93cf75c 100644 --- a/keps/2724-topology-aware-scheduling/README.md +++ b/keps/2724-topology-aware-scheduling/README.md @@ -1072,11 +1072,11 @@ Since v0.15, the available feature gates are as follows: | feature gate / annotation | preferred | required | unconstrained | | ------------------------------------------ | ----------------- | ----------------- | ----------------- | -| None
or TASProfileMixed (deprecated) | BestFit | BestFit | LeastFreeCapacity | +| None
or TASProfileMixed (default) | BestFit | BestFit | LeastFreeCapacity | | TASProfileBestFit (deprecated) | BestFit | BestFit | BestFit | | TASProfileLeastFreeCapacity (deprecated) | LeastFreeCapacity | LeastFreeCapacity | LeastFreeCapacity | -Based on the user feedback, we decided to make `TASProfileMixed` default. (The corresponding feature gate is hence obsolete; we formally keep it "deprecated" for backwards compatibility). It differs from the previous default only in the `unconstrained` case - in which Kueue should prioritize minimizing fragmentation which is provided by the `LeastFreeCapacity` algorithm. +Based on the user feedback, we decided to make `TASProfileMixed` default starting in v0.15. (The corresponding feature gate is hence obsolete; we formally keep it "deprecated" for backwards compatibility). It differs from the previous default only in the `unconstrained` case - in which Kueue should prioritize minimizing fragmentation which is provided by the `LeastFreeCapacity` algorithm. For users still preferring the "always BestFit" profile, we introduce the `TASProfileBestFit` feature gate, marking it as deprecated. We will remove it in v0.17 if we see no report indicating a need for that configuration. diff --git a/pkg/cache/scheduler/tas_cache_test.go b/pkg/cache/scheduler/tas_cache_test.go index a4044c8d59d..f5ddda96341 100644 --- a/pkg/cache/scheduler/tas_cache_test.go +++ b/pkg/cache/scheduler/tas_cache_test.go @@ -658,18 +658,11 @@ func TestFindTopologyAssignments(t *testing.T) { wantAssignment: &kueue.TopologyAssignment{ Levels: defaultOneLevel, Domains: []kueue.TopologyDomainAssignment{ - { - Count: 4, - Values: []string{ - "x3", - }, - }, - { - Count: 2, - Values: []string{ - "x6", - }, - }, + {Count: 1, Values: []string{"x1"}}, + {Count: 1, Values: []string{"x3"}}, + {Count: 1, Values: []string{"x5"}}, + {Count: 1, Values: []string{"x2"}}, + {Count: 2, Values: []string{"x6"}}, }, }, }}, @@ -688,18 +681,11 @@ func TestFindTopologyAssignments(t *testing.T) { wantAssignment: &kueue.TopologyAssignment{ Levels: defaultOneLevel, Domains: []kueue.TopologyDomainAssignment{ - { - Count: 4, - Values: []string{ - "x3", - }, - }, - { - Count: 2, - Values: []string{ - "x6", - }, - }, + {Count: 1, Values: []string{"x1"}}, + {Count: 1, Values: []string{"x3"}}, + {Count: 1, Values: []string{"x5"}}, + {Count: 1, Values: []string{"x2"}}, + {Count: 2, Values: []string{"x6"}}, }, }, }}, diff --git a/pkg/features/kube_features.go b/pkg/features/kube_features.go index 5cc93a14f54..9b99f27e2be 100644 --- a/pkg/features/kube_features.go +++ b/pkg/features/kube_features.go @@ -258,7 +258,7 @@ var defaultVersionedFeatureGates = map[featuregate.Feature]featuregate.Versioned }, TASProfileMixed: { {Version: version.MustParse("0.10"), Default: false, PreRelease: featuregate.Alpha}, - {Version: version.MustParse("0.11"), Default: false, PreRelease: featuregate.Deprecated}, + {Version: version.MustParse("0.15"), Default: true, PreRelease: featuregate.Beta}, }, HierarchicalCohorts: { {Version: version.MustParse("0.11"), Default: true, PreRelease: featuregate.Beta},