Stop supporting FlowSchema and PriorityLevelConfiguration v1beta3.

Makefile

@@ -266,8 +266,7 @@ artifacts: kustomize yq helm ## Generate release artifacts.
 	$(KUSTOMIZE) build config/dev -o artifacts/manifests-dev.yaml
 	$(KUSTOMIZE) build config/alpha-enabled -o artifacts/manifests-alpha-enabled.yaml
 	$(KUSTOMIZE) build config/prometheus -o artifacts/prometheus.yaml
-	$(KUSTOMIZE) build config/visibility-apf/default -o artifacts/visibility-apf.yaml
-	$(KUSTOMIZE) build config/visibility-apf/1_28 -o artifacts/visibility-apf-1-28.yaml
+	$(KUSTOMIZE) build config/visibility-apf -o artifacts/visibility-apf.yaml
 	@$(call clean-manifests)
 	# Update the image tag and policy
 	$(YQ)  e  '.controllerManager.manager.image.repository = "$(IMAGE_REPO)" | .controllerManager.manager.image.tag = "$(GIT_TAG)" | .controllerManager.manager.image.pullPolicy = "IfNotPresent"' -i charts/kueue/values.yaml

charts/kueue/templates/visibility-apf/flowschema.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.enableVisibilityAPF }}
-apiVersion: flowcontrol.apiserver.k8s.io/{{ and (eq .Capabilities.KubeVersion.Major "1") (eq .Capabilities.KubeVersion.Minor "28") | ternary "v1beta3" "v1" }}
+apiVersion: flowcontrol.apiserver.k8s.io/v1
 kind: FlowSchema
 metadata:
   labels:

charts/kueue/templates/visibility-apf/prioritylevelconfigurations.yaml

@@ -1,5 +1,5 @@
 {{- if .Values.enableVisibilityAPF }}
-apiVersion: flowcontrol.apiserver.k8s.io/{{ and (eq .Capabilities.KubeVersion.Major "1") (eq .Capabilities.KubeVersion.Minor "28") | ternary "v1beta3" "v1" }}
+apiVersion: flowcontrol.apiserver.k8s.io/v1
 kind: PriorityLevelConfiguration
 metadata:
   labels:

config/visibility-apf/default/kustomization.yaml → config/visibility-apf/kustomization.yaml

@@ -11,4 +11,4 @@ labels:
       control-plane: controller-manager
 
 resources:
-  - ../../components/visibility-apf/
+  - ../components/visibility-apf/

hack/e2e-common.sh

@@ -143,11 +143,7 @@ function cluster_kind_load_image {
 # $1 cluster
 function cluster_kueue_deploy {
     kubectl config use-context "kind-${1}"
-    if [ "${KIND_VERSION%.*}" = "1.28" ]; then
-        kubectl apply --server-side -k test/e2e/config/1_28
-    else
-        kubectl apply --server-side -k test/e2e/config/default
-    fi
+    kubectl apply --server-side -k test/e2e/config/default
 }
 
 #$1 - cluster name

hack/update-helm.sh

@@ -350,7 +350,6 @@ done
 
 # Replace flowcontrol version on visibility-apf directory
 for output_file in "${DEST_VISIBILITY_APF_DIR}"/*.yaml; do
-  $YQ -N -i '.apiVersion = "flowcontrol.apiserver.k8s.io/{{ and (eq .Capabilities.KubeVersion.Major \"1\") (eq .Capabilities.KubeVersion.Minor \"28\") | ternary \"v1beta3\" \"v1\" }}"' "$output_file"
   $YQ -N -i '.metadata.name |= "{{ include \"kueue.fullname\" . }}-" + .' "$output_file"
   $YQ -N -i '.metadata.namespace = "{{ .Release.Namespace }}"' "$output_file"
   $SED -i '/^metadata:.*/a\  labels:\n  {{- include "kueue.labels" . | nindent 4 }}' "$output_file"

site/content/en/docs/tasks/manage/monitor_pending_workloads/pending_workloads_on_demand.md

@@ -24,12 +24,11 @@ Make sure the following conditions are met:
 
 ### Configure API Priority and Fairness:
 
-To install the [API Priority and Fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) configuration for the visibility API apply one of the manifests, depending on your Kubernetes version:
+To install the [API Priority and Fairness](https://kubernetes.io/docs/concepts/cluster-administration/flow-control/) configuration for the visibility API apply manifests:
 
-{{< tabpane lang="shell" persist=disabled >}}
-{{< tab header="Kubernetes 1.29 or newer" >}} kubectl apply --server-side -f https://github.com/kubernetes-sigs/kueue/releases/download/{{< param "version" >}}/visibility-apf.yaml {{< /tab >}}
-{{< tab header="Kubernetes 1.28" >}} kubectl apply --server-side -f https://github.com/kubernetes-sigs/kueue/releases/download/{{< param "version" >}}/visibility-apf-1-28.yaml {{< /tab >}}
-{{< /tabpane >}}
+```shell
+kubectl apply --server-side -f https://github.com/kubernetes-sigs/kueue/releases/download/{{< param "version" >}}/visibility-apf.yaml
+```
 
 ### Directly accessing the Visibility API
 

test/e2e/config/default/kustomization.yaml

@@ -1,3 +1,26 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
 resources:
-- ../common
-- ../../../../config/visibility-apf/default
+- ../../../../config/dev
+- ../../../../config/visibility-apf
+
+replicas:
+- name: kueue-controller-manager
+  count: 2
+
+patches:
+- path: manager_e2e_patch.yaml
+  target:
+    group: apps
+    version: v1
+    kind: Deployment
+    name: kueue-controller-manager
+    namespace: kueue-system
+
+configMapGenerator:
+- behavior: merge
+  files:
+  - controller_manager_config.yaml
+  name: kueue-manager-config
+  namespace: kueue-system