v1beta2: drop deprecated Flavors field from LocalQueueStatus

Author: mbobrovskyi

.golangci.yaml

@@ -90,12 +90,6 @@ linters:
       - linters:
           - staticcheck
         text: 'SA1019: j.Status.RayClusterStatus.State is deprecated: the State field is replaced by the Conditions field.'
-      - linters:
-          - staticcheck
-        text: 'SA1019: kueue.LocalQueueFlavorStatus is deprecated: LocalQueueFlavorStatus is deprecated and marked for removal in v1beta2.'
-      - linters:
-        - staticcheck
-        text: 'SA1019: stats.Flavors is deprecated: Flavors is deprecated and marked for removal in v1beta2.'
       - linters:
           - fatcontext
         path: ^test/*

apis/kueue/v1beta1/zz_generated.conversion.go

@@ -56,42 +56,6 @@ type LocalQueueSpec struct {
 	FairSharing *FairSharing `json:"fairSharing,omitempty"`
 }
 
-// Deprecated: LocalQueueFlavorStatus is deprecated and marked for removal in v1beta2.
-type LocalQueueFlavorStatus struct {
-	// name of the flavor.
-	// +required
-	// +kubebuilder:validation:Required
-	Name ResourceFlavorReference `json:"name"`
-
-	// resources used in the flavor.
-	// +listType=set
-	// +kubebuilder:validation:MaxItems=16
-	// +optional
-	Resources []corev1.ResourceName `json:"resources,omitempty"`
-
-	// nodeLabels are labels that associate the ResourceFlavor with Nodes that
-	// have the same labels.
-	// +mapType=atomic
-	// +kubebuilder:validation:MaxProperties=8
-	// +optional
-	NodeLabels map[string]string `json:"nodeLabels,omitempty"`
-
-	// nodeTaints are taints that the nodes associated with this ResourceFlavor
-	// have.
-	// +listType=atomic
-	// +kubebuilder:validation:MaxItems=8
-	// +optional
-	NodeTaints []corev1.Taint `json:"nodeTaints,omitempty"`
-
-	// topology is the topology that associated with this ResourceFlavor.
-	//
-	// This is a beta field and requires enabling the TopologyAwareScheduling
-	// feature gate.
-	//
-	// +optional
-	Topology *TopologyInfo `json:"topology,omitempty"`
-}
-
 type TopologyInfo struct {
 	// name is the name of the topology.
 	//
@@ -150,14 +114,6 @@ type LocalQueueStatus struct {
 	// +optional
 	FlavorsUsage []LocalQueueFlavorUsage `json:"flavorsUsage"`
 
-	// flavors lists all currently available ResourceFlavors in specified ClusterQueue.
-	// +listType=map
-	// +listMapKey=name
-	// +kubebuilder:validation:MaxItems=16
-	// +optional
-	// Deprecated: Flavors is deprecated and marked for removal in v1beta2.
-	Flavors []LocalQueueFlavorStatus `json:"flavors,omitempty"`
-
 	// fairSharing contains the information about the current status of fair sharing.
 	// +optional
 	FairSharing *FairSharingStatus `json:"fairSharing,omitempty"`

apis/kueue/v1beta2/localqueue_types.go

@@ -641,99 +641,6 @@ spec:
                   required:
                     - weightedShare
                   type: object
-                flavors:
-                  description: |-
-                    flavors lists all currently available ResourceFlavors in specified ClusterQueue.
-                    Deprecated: Flavors is deprecated and marked for removal in v1beta2.
-                  items:
-                    description: 'Deprecated: LocalQueueFlavorStatus is deprecated and marked for removal in v1beta2.'
-                    properties:
-                      name:
-                        description: name of the flavor.
-                        maxLength: 253
-                        pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                        type: string
-                      nodeLabels:
-                        additionalProperties:
-                          type: string
-                        description: |-
-                          nodeLabels are labels that associate the ResourceFlavor with Nodes that
-                          have the same labels.
-                        maxProperties: 8
-                        type: object
-                        x-kubernetes-map-type: atomic
-                      nodeTaints:
-                        description: |-
-                          nodeTaints are taints that the nodes associated with this ResourceFlavor
-                          have.
-                        items:
-                          description: |-
-                            The node this Taint is attached to has the "effect" on
-                            any pod that does not tolerate the Taint.
-                          properties:
-                            effect:
-                              description: |-
-                                Required. The effect of the taint on pods
-                                that do not tolerate the taint.
-                                Valid effects are NoSchedule, PreferNoSchedule and NoExecute.
-                              type: string
-                            key:
-                              description: Required. The taint key to be applied to a node.
-                              type: string
-                            timeAdded:
-                              description: TimeAdded represents the time at which the taint was added.
-                              format: date-time
-                              type: string
-                            value:
-                              description: The taint value corresponding to the taint key.
-                              type: string
-                          required:
-                            - effect
-                            - key
-                          type: object
-                        maxItems: 8
-                        type: array
-                        x-kubernetes-list-type: atomic
-                      resources:
-                        description: resources used in the flavor.
-                        items:
-                          description: ResourceName is the name identifying various resources in a ResourceList.
-                          type: string
-                        maxItems: 16
-                        type: array
-                        x-kubernetes-list-type: set
-                      topology:
-                        description: |-
-                          topology is the topology that associated with this ResourceFlavor.
-
-                          This is a beta field and requires enabling the TopologyAwareScheduling
-                          feature gate.
-                        properties:
-                          levels:
-                            description: levels define the levels of topology.
-                            items:
-                              type: string
-                            maxItems: 16
-                            minItems: 1
-                            type: array
-                            x-kubernetes-list-type: atomic
-                          name:
-                            description: name is the name of the topology.
-                            maxLength: 253
-                            pattern: ^[a-z0-9]([-a-z0-9]*[a-z0-9])?(\.[a-z0-9]([-a-z0-9]*[a-z0-9])?)*$
-                            type: string
-                        required:
-                          - levels
-                          - name
-                        type: object
-                    required:
-                      - name
-                    type: object
-                  maxItems: 16
-                  type: array
-                  x-kubernetes-list-map-keys:
-                    - name
-                  x-kubernetes-list-type: map
                 flavorsReservation:
                   description: |-
                     flavorsReservation are the reserved quotas, by flavor currently in use by the