Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 472df03

Browse files
committedApr 11, 2025··
Looser coupling of Kueue versions
Decouple the Kueue version deployed on the cluster for CI testing from the golang dependency on Kueue APIs used in the e2e go test code.
1 parent b86e75d commit 472df03

File tree

2 files changed

+4
-7
lines changed

2 files changed

+4
-7
lines changed
 

‎Makefile

+1-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ APPWRAPPER_VERSION ?= v1.1.1
1616
APPWRAPPER_REPO ?= github.com/project-codeflare/appwrapper
1717
APPWRAPPER_CRD ?= ${APPWRAPPER_REPO}/config/crd?ref=${APPWRAPPER_VERSION}
1818

19-
# KUEUE_VERSION defines the default version of Kueue (used for testing)
19+
# KUEUE_VERSION defines the version of Kueue deployed for testing
2020
KUEUE_VERSION ?= v0.11.0
2121

2222
USE_RHOAI ?= true
@@ -160,7 +160,6 @@ vet: ## Run go vet against code.
160160
.PHONY: modules
161161
modules: ## Update Go dependencies.
162162
go get github.com/ray-project/kuberay/ray-operator@$(KUBERAY_VERSION)
163-
go get sigs.k8s.io/kueue@$(KUEUE_VERSION)
164163
go get github.com/project-codeflare/appwrapper@$(APPWRAPPER_VERSION)
165164
go mod tidy
166165

‎go.mod

+3-5
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ require (
1212
github.com/openshift/client-go v0.0.0-20240904130219-3795e907a202
1313
github.com/project-codeflare/appwrapper v1.1.1
1414
github.com/project-codeflare/codeflare-common v0.0.0-20250321141415-67bb8bd932df
15-
github.com/ray-project/kuberay/ray-operator v1.3.1
15+
github.com/ray-project/kuberay/ray-operator v1.2.2
1616
go.uber.org/zap v1.27.0
1717
golang.org/x/exp v0.0.0-20250305212735-054e65f0b394
1818
k8s.io/api v0.32.3
@@ -23,7 +23,7 @@ require (
2323
k8s.io/klog/v2 v2.130.1
2424
k8s.io/utils v0.0.0-20241210054802-24370beab758
2525
sigs.k8s.io/controller-runtime v0.20.3
26-
sigs.k8s.io/kueue v0.11.0
26+
sigs.k8s.io/kueue v0.10.1
2727
sigs.k8s.io/yaml v1.4.0
2828
)
2929

@@ -37,16 +37,14 @@ replace k8s.io/apimachinery v0.32.3 => k8s.io/apimachinery v0.31.4
3737

3838
replace sigs.k8s.io/controller-runtime v0.20.3 => sigs.k8s.io/controller-runtime v0.19.3
3939

40-
replace sigs.k8s.io/kueue v0.11.0 => sigs.k8s.io/kueue v0.10.1
41-
4240
replace sigs.k8s.io/custom-metrics-apiserver => sigs.k8s.io/custom-metrics-apiserver v1.25.1-0.20230306170449-63d8c93851f3
4341

4442
replace go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp => go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.44.0
4543

4644
replace github.com/jackc/pgx/v4 => github.com/jackc/pgx/v5 v5.5.4
4745

4846
// Workaround deprecation of cluster.Status.State in ray-operator v1.2.2
49-
replace github.com/ray-project/kuberay/ray-operator v1.3.1 => github.com/ray-project/kuberay/ray-operator v1.2.1
47+
replace github.com/ray-project/kuberay/ray-operator v1.2.2 => github.com/ray-project/kuberay/ray-operator v1.2.1
5048

5149
require (
5250
github.com/aymerick/douceur v0.2.0 // indirect

0 commit comments

Comments
 (0)
Please sign in to comment.