Skip to content

Commit de25b6a

Browse files
jamOne-jamOne-
authored
Revert "feat: Bump up the default Kueue version to v0.14.1 (#691)" (#735)
* feat: Add sub-slicing system validation in workload create * Revert "feat: Bump up the default Kueue version to v0.14.1 (#691)" This reverts commit 556d912.
1 parent 2f5f5cd commit de25b6a

9 files changed

+15
-15
lines changed

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
KUEUE_REPO=https://github.com/kubernetes-sigs/kueue.git
22

33
KUBECTL_VERSION := $(shell curl -L -s https://dl.k8s.io/release/stable.txt)
4-
KUEUE_VERSION=v0.14.1
4+
KUEUE_VERSION=v0.12.2
55
KJOB_VERSION=v0.1.0
66

77
OS := $(shell uname -s | tr A-Z a-z)

‎goldens/Basic_cluster_create.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,10 @@ kubectl apply --server-side -f https://github.com/google/pathways-job/releases/d
7474
[XPK] Enabling Kueue on the cluster
7575
[XPK] Task: `Get kueue version on server` is implemented by the following command not running since it is a dry run.
7676
kubectl get deployment kueue-controller-manager -n kueue-system -o jsonpath='{.spec.template.spec.containers[0].image}'
77-
[XPK] Installing Kueue version v0.14.1...
77+
[XPK] Installing Kueue version v0.12.2...
7878
[XPK] Try 1: Install Kueue
7979
[XPK] Task: `Install Kueue` is implemented by the following command not running since it is a dry run.
80-
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.14.1/manifests.yaml
80+
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.12.2/manifests.yaml
8181
[XPK] Task: `Wait for Kueue to be available` is implemented by the following command not running since it is a dry run.
8282
kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=available --timeout=10m
8383
[XPK] Applying following Kueue resources:

‎goldens/Cluster_create_private.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,10 @@ kubectl apply --server-side -f https://github.com/google/pathways-job/releases/d
7979
[XPK] Enabling Kueue on the cluster
8080
[XPK] Task: `Get kueue version on server` is implemented by the following command not running since it is a dry run.
8181
kubectl get deployment kueue-controller-manager -n kueue-system -o jsonpath='{.spec.template.spec.containers[0].image}'
82-
[XPK] Installing Kueue version v0.14.1...
82+
[XPK] Installing Kueue version v0.12.2...
8383
[XPK] Try 1: Install Kueue
8484
[XPK] Task: `Install Kueue` is implemented by the following command not running since it is a dry run.
85-
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.14.1/manifests.yaml
85+
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.12.2/manifests.yaml
8686
[XPK] Task: `Wait for Kueue to be available` is implemented by the following command not running since it is a dry run.
8787
kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=available --timeout=10m
8888
[XPK] Applying following Kueue resources:

‎goldens/Cluster_create_with_gb200-4.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,10 @@ kubectl apply --server-side -f https://github.com/google/pathways-job/releases/d
7878
[XPK] Enabling Kueue on the cluster
7979
[XPK] Task: `Get kueue version on server` is implemented by the following command not running since it is a dry run.
8080
kubectl get deployment kueue-controller-manager -n kueue-system -o jsonpath='{.spec.template.spec.containers[0].image}'
81-
[XPK] Installing Kueue version v0.14.1...
81+
[XPK] Installing Kueue version v0.12.2...
8282
[XPK] Try 1: Install Kueue
8383
[XPK] Task: `Install Kueue` is implemented by the following command not running since it is a dry run.
84-
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.14.1/manifests.yaml
84+
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.12.2/manifests.yaml
8585
[XPK] Task: `Wait for Kueue to be available` is implemented by the following command not running since it is a dry run.
8686
kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=available --timeout=10m
8787
[XPK] Applying following Kueue resources:

‎goldens/NAP_cluster-create.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,10 @@ kubectl apply --server-side -f https://github.com/google/pathways-job/releases/d
8585
[XPK] Enabling Kueue on the cluster
8686
[XPK] Task: `Get kueue version on server` is implemented by the following command not running since it is a dry run.
8787
kubectl get deployment kueue-controller-manager -n kueue-system -o jsonpath='{.spec.template.spec.containers[0].image}'
88-
[XPK] Installing Kueue version v0.14.1...
88+
[XPK] Installing Kueue version v0.12.2...
8989
[XPK] Try 1: Install Kueue
9090
[XPK] Task: `Install Kueue` is implemented by the following command not running since it is a dry run.
91-
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.14.1/manifests.yaml
91+
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.12.2/manifests.yaml
9292
[XPK] Task: `Wait for Kueue to be available` is implemented by the following command not running since it is a dry run.
9393
kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=available --timeout=10m
9494
[XPK] Applying following Kueue resources:

‎goldens/NAP_cluster-create_with_pathways.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,10 @@ kubectl apply --server-side -f https://github.com/google/pathways-job/releases/d
8686
[XPK] Enabling Kueue on the cluster
8787
[XPK] Task: `Get kueue version on server` is implemented by the following command not running since it is a dry run.
8888
kubectl get deployment kueue-controller-manager -n kueue-system -o jsonpath='{.spec.template.spec.containers[0].image}'
89-
[XPK] Installing Kueue version v0.14.1...
89+
[XPK] Installing Kueue version v0.12.2...
9090
[XPK] Try 1: Install Kueue
9191
[XPK] Task: `Install Kueue` is implemented by the following command not running since it is a dry run.
92-
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.14.1/manifests.yaml
92+
kubectl apply --server-side --force-conflicts -f https://github.com/kubernetes-sigs/kueue/releases/download/v0.12.2/manifests.yaml
9393
[XPK] Task: `Wait for Kueue to be available` is implemented by the following command not running since it is a dry run.
9494
kubectl wait deploy/kueue-controller-manager -nkueue-system --for=condition=available --timeout=10m
9595
[XPK] Applying following Kueue resources:

‎src/xpk/core/kueue_manager.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
KUEUE_SUB_SLICING_TOPOLOGY_JINJA_FILE = "kueue_sub_slicing_topology.yaml.j2"
5252
MEMORY_SIZE_PER_VM = 1.2
5353
MIN_MEMORY_LIMIT_SIZE = 4096
54-
KUEUE_VERSION = "v0.14.1"
54+
KUEUE_VERSION = "v0.12.2"
5555

5656

5757
@dataclass
@@ -131,7 +131,7 @@ def get_installed_kueue_version(self) -> tuple[int, str | None]:
131131
command,
132132
task,
133133
dry_run_return_val="""
134-
v0.14.1""",
134+
v0.12.1""",
135135
)
136136
if return_code != 0:
137137
return return_code, None

‎src/xpk/core/kueue_manager_test.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ def test_install_or_upgrade_when_newer_version_already_installed(
8383
self, mock_configure, mock_install, mock_get_version
8484
):
8585
"""Test install_or_upgrade when Kueue is already up to date."""
86-
mock_get_version.return_value = (0, "v0.99.9")
86+
mock_get_version.return_value = (0, "v0.12.3")
8787
kueue_config = MagicMock(spec=KueueConfig)
8888

8989
result = self.kueue_manager.install_or_upgrade(kueue_config)

‎src/xpk/templates/kueue_gke_default_topology.yaml.j2‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
apiVersion: kueue.x-k8s.io/v1beta1
1+
apiVersion: kueue.x-k8s.io/v1alpha1
22
kind: Topology
33
metadata:
44
name: "gke-default"

0 commit comments

Comments
 (0)