Cleanup after graduation TAS to beta. (#6921)

Author: mbobrovskyi

apis/kueue/v1beta1/localqueue_types.go

@@ -84,7 +84,7 @@ type LocalQueueFlavorStatus struct {
 
 	// topology is the topology that associated with this ResourceFlavor.
 	//
-	// This is an alpha field and requires enabling the TopologyAwareScheduling
+	// This is a beta field and requires enabling the TopologyAwareScheduling
 	// feature gate.
 	//
 	// +optional

charts/kueue/templates/crd/kueue.x-k8s.io_localqueues.yaml

@@ -336,7 +336,7 @@ spec:
                         description: |-
                           topology is the topology that associated with this ResourceFlavor.
 
-                          This is an alpha field and requires enabling the TopologyAwareScheduling
+                          This is a beta field and requires enabling the TopologyAwareScheduling
                           feature gate.
                         properties:
                           levels:

config/components/crd/bases/kueue.x-k8s.io_localqueues.yaml

@@ -331,7 +331,7 @@ spec:
                       description: |-
                         topology is the topology that associated with this ResourceFlavor.
 
-                        This is an alpha field and requires enabling the TopologyAwareScheduling
+                        This is a beta field and requires enabling the TopologyAwareScheduling
                         feature gate.
                       properties:
                         levels:

pkg/config/validation_test.go

@@ -868,9 +868,8 @@ func TestValidateFeatureGates(t *testing.T) {
 			errorStr:        "Cannot use more than one TAS profiles",
 		},
 		"cannot set TAS profile with TAS disabled": {
-			featureGateMap: map[string]bool{"TASProfileLeastFreeCapacity": true,
-				"TopologyAwareScheduling": true},
-			errorStr: "Cannot use a TAS profile with TAS disabled",
+			featureGateMap: map[string]bool{"TASProfileLeastFreeCapacity": true},
+			errorStr:       "Cannot use a TAS profile with TAS disabled",
 		},
 	}
 	for name, tc := range cases {

pkg/scheduler/scheduler_test.go

@@ -7026,7 +7026,6 @@ func TestScheduleForTAS(t *testing.T) {
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
-			features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, true)
 			for fg, enable := range tc.featureGates {
 				features.SetFeatureGateDuringTest(t, fg, enable)
 			}
@@ -7581,7 +7580,6 @@ func TestScheduleForTASPreemption(t *testing.T) {
 	}
 	for name, tc := range cases {
 		t.Run(name, func(t *testing.T) {
-			features.SetFeatureGateDuringTest(t, features.TopologyAwareScheduling, true)
 			ctx, log := utiltesting.ContextWithLog(t)
 
 			clientBuilder := utiltesting.NewClientBuilder().

site/content/en/docs/reference/kueue.v1beta1.md

@@ -1595,7 +1595,7 @@ have.</p>
 </td>
 <td>
    <p>topology is the topology that associated with this ResourceFlavor.</p>
-<p>This is an alpha field and requires enabling the TopologyAwareScheduling
+<p>This is a beta field and requires enabling the TopologyAwareScheduling
 feature gate.</p>
 </td>
 </tr>

test/e2e/config/default/controller_manager_config.yaml

@@ -37,5 +37,4 @@ integrations:
   - "leaderworkerset.x-k8s.io/leaderworkerset"
 featureGates:
   MultiKueueBatchJobWithManagedBy: true
-  TopologyAwareScheduling: true
   LocalQueueMetrics: true

test/e2e/config/default/values.yaml

@@ -67,5 +67,4 @@ managerConfig:
         - "leaderworkerset.x-k8s.io/leaderworkerset"
     featureGates:
       MultiKueueBatchJobWithManagedBy: true
-      TopologyAwareScheduling: true
       LocalQueueMetrics: true

test/integration/singlecluster/controller/jobs/appwrapper/appwrapper_controller_test.go

@@ -40,7 +40,6 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/constants"
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadaw "sigs.k8s.io/kueue/pkg/controller/jobs/appwrapper"
-	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingaw "sigs.k8s.io/kueue/pkg/util/testingjobs/appwrapper"
 	utiltestingjob "sigs.k8s.io/kueue/pkg/util/testingjobs/job"
@@ -835,7 +834,7 @@ var _ = ginkgo.Describe("AppWrapper controller interacting with scheduler", gink
 	})
 })
 
-var _ = ginkgo.Describe("AppWrapper controller when TopologyAwareScheduling enabled", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
+var _ = ginkgo.Describe("AppWrapper controller with TopologyAwareScheduling", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	const (
 		nodeGroupLabel = "node-group"
 		tasBlockLabel  = "cloud.com/topology-block"
@@ -859,8 +858,6 @@ var _ = ginkgo.Describe("AppWrapper controller when TopologyAwareScheduling enab
 	})
 
 	ginkgo.BeforeEach(func() {
-		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.TopologyAwareScheduling, true)
-
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "tas-aw-")
 
 		nodes = []corev1.Node{

test/integration/singlecluster/controller/jobs/jaxjob/jaxjob_controller_test.go

@@ -35,7 +35,6 @@ import (
 	"sigs.k8s.io/kueue/pkg/controller/jobframework"
 	workloadjaxjob "sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/jobs/jaxjob"
 	"sigs.k8s.io/kueue/pkg/controller/jobs/kubeflow/kubeflowjob"
-	"sigs.k8s.io/kueue/pkg/features"
 	"sigs.k8s.io/kueue/pkg/util/testing"
 	testingjaxjob "sigs.k8s.io/kueue/pkg/util/testingjobs/jaxjob"
 	testingnode "sigs.k8s.io/kueue/pkg/util/testingjobs/node"
@@ -561,7 +560,7 @@ var _ = ginkgo.Describe("Job controller interacting with scheduler", ginkgo.Orde
 	})
 })
 
-var _ = ginkgo.Describe("JAXJob controller when TopologyAwareScheduling enabled", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
+var _ = ginkgo.Describe("JAXJob controller with TopologyAwareScheduling", ginkgo.Ordered, ginkgo.ContinueOnFailure, func() {
 	const (
 		nodeGroupLabel = "node-group"
 	)
@@ -584,8 +583,6 @@ var _ = ginkgo.Describe("JAXJob controller when TopologyAwareScheduling enabled"
 	})
 
 	ginkgo.BeforeEach(func() {
-		features.SetFeatureGateDuringTest(ginkgo.GinkgoTB(), features.TopologyAwareScheduling, true)
-
 		ns = util.CreateNamespaceFromPrefixWithLog(ctx, k8sClient, "tas-jaxjob-")
 
 		nodes = []corev1.Node{