From 939ef1dea7504a820cc769fcb2f9acccc8519a77 Mon Sep 17 00:00:00 2001 From: Antonin Stefanutti Date: Tue, 8 Aug 2023 15:02:07 +0200 Subject: [PATCH] Upgrade MCAD to version 1.33.0 --- Makefile | 3 ++- controllers/defaults.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- test/e2e/mnist_pytorch_mcad_job_test.go | 2 +- test/e2e/mnist_rayjob_mcad_raycluster_test.go | 2 +- test/support/client.go | 2 +- test/support/mcad.go | 2 +- 8 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Makefile b/Makefile index c6115a28e..b6be34ce1 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ BUNDLE_VERSION ?= $(VERSION:v%=%) INSTASCALE_VERSION ?= v0.0.5 # MCAD_VERSION defines the default version of the MCAD controller -MCAD_VERSION ?= v1.32.0 +MCAD_VERSION ?= v1.33.0 # MCAD_REF, MCAD_REPO and MCAD_CRD define the reference to MCAD CRD resources MCAD_REF ?= release-${MCAD_VERSION} MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher @@ -223,6 +223,7 @@ vet: ## Run go vet against code. .PHONY: modules modules: ## Update Go dependencies. go get $(MCAD_REPO)@$(MCAD_VERSION) + go get github.com/ray-project/kuberay/ray-operator .PHONY: build build: modules defaults generate fmt vet ## Build manager binary. diff --git a/controllers/defaults.go b/controllers/defaults.go index 4dc0b777b..3a0a746dd 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -5,6 +5,6 @@ package controllers // *********************** const ( - MCADImage = "quay.io/project-codeflare/mcad-controller:release-v1.32.0" + MCADImage = "quay.io/project-codeflare/mcad-controller:release-v1.33.0" InstaScaleImage = "quay.io/project-codeflare/instascale-controller:v0.0.5" ) diff --git a/go.mod b/go.mod index c144579cd..2987d8fd5 100644 --- a/go.mod +++ b/go.mod @@ -11,8 +11,8 @@ require ( github.com/openshift-eng/openshift-goimports v0.0.0-20230304234052-c70783e636f2 github.com/openshift/api v0.0.0-20230213134911-7ba313770556 github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c - github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0 - github.com/ray-project/kuberay/ray-operator v0.0.0-20230802222355-153f35c9fd14 + github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0 + github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6 go.uber.org/zap v1.24.0 k8s.io/api v0.26.3 k8s.io/apimachinery v0.26.3 diff --git a/go.sum b/go.sum index ad4b81b95..4e90f974b 100644 --- a/go.sum +++ b/go.sum @@ -486,8 +486,8 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI= github.com/pquerna/cachecontrol v0.0.0-20171018203845-0dec1b30a021/go.mod h1:prYjPmNq4d1NPVmpShWobRqXY3q7Vp+80DqgxxUrUIA= -github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0 h1:17lwqvxcWBTi9245lVZgJPvksGwAGA58s8dl7PzpbyE= -github.com/project-codeflare/multi-cluster-app-dispatcher v1.32.0/go.mod h1:fmbU5LuV1Z2Sbu1FCEoVuw8qxDFcalXvkPyMfGZHHTc= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0 h1:6a+MnxcFSlheC7RIPGg3s/QCt5+7dD8mJKwdpST7i70= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.33.0/go.mod h1:0J0BDSaIN5lvlmgw+32FcMqe8SflXHtHByUbHmPl4w8= github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw= github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso= github.com/prometheus/client_golang v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= @@ -519,8 +519,8 @@ github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.8.0 h1:ODq8ZFEaYeCaZOJlZZdJA2AbQR98dSHSM1KW/You5mo= github.com/prometheus/procfs v0.8.0/go.mod h1:z7EfXMXOkbkqb9IINtpCn86r/to3BnA0uaxHdg830/4= github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU= -github.com/ray-project/kuberay/ray-operator v0.0.0-20230802222355-153f35c9fd14 h1:KnqFh/uiqY7Zdwr9fUaefMa4j0rYSLkk9tuE4lmW4Ec= -github.com/ray-project/kuberay/ray-operator v0.0.0-20230802222355-153f35c9fd14/go.mod h1:hqphTv0O5l6hHf4/OtEn4ie/OHPoVydLograwaK5cHI= +github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6 h1:0O9dKI7eCPJIzJD/HfzbQgACq4GTr4j+VpwjdS7Qv0w= +github.com/ray-project/kuberay/ray-operator v0.0.0-20230807232553-238cb4e945b6/go.mod h1:hqphTv0O5l6hHf4/OtEn4ie/OHPoVydLograwaK5cHI= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= diff --git a/test/e2e/mnist_pytorch_mcad_job_test.go b/test/e2e/mnist_pytorch_mcad_job_test.go index 88eca341d..b2b7fa13c 100644 --- a/test/e2e/mnist_pytorch_mcad_job_test.go +++ b/test/e2e/mnist_pytorch_mcad_job_test.go @@ -137,7 +137,7 @@ func TestMNISTPyTorchMCAD(t *testing.T) { }, } - _, err = test.Client().MCAD().ArbV1().AppWrappers(namespace.Name).Create(aw) + _, err = test.Client().MCAD().McadV1beta1().AppWrappers(namespace.Name).Create(test.Ctx(), aw, metav1.CreateOptions{}) test.Expect(err).NotTo(HaveOccurred()) test.T().Logf("Created MCAD %s/%s successfully", aw.Namespace, aw.Name) diff --git a/test/e2e/mnist_rayjob_mcad_raycluster_test.go b/test/e2e/mnist_rayjob_mcad_raycluster_test.go index 72645d5b2..e6aaea8f1 100644 --- a/test/e2e/mnist_rayjob_mcad_raycluster_test.go +++ b/test/e2e/mnist_rayjob_mcad_raycluster_test.go @@ -212,7 +212,7 @@ func TestMNISTRayJobMCADRayCluster(t *testing.T) { }, } - aw, err = test.Client().MCAD().ArbV1().AppWrappers(namespace.Name).Create(aw) + aw, err = test.Client().MCAD().McadV1beta1().AppWrappers(namespace.Name).Create(test.Ctx(), aw, metav1.CreateOptions{}) test.Expect(err).NotTo(HaveOccurred()) test.T().Logf("Created MCAD %s/%s successfully", aw.Namespace, aw.Name) diff --git a/test/support/client.go b/test/support/client.go index c3c4433ec..86a895eec 100644 --- a/test/support/client.go +++ b/test/support/client.go @@ -17,7 +17,7 @@ limitations under the License. package support import ( - mcadclient "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/controller-versioned" + mcadclient "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/client/clientset/versioned" rayclient "github.com/ray-project/kuberay/ray-operator/pkg/client/clientset/versioned" "k8s.io/client-go/kubernetes" diff --git a/test/support/mcad.go b/test/support/mcad.go index 607a94f74..a4d69b759 100644 --- a/test/support/mcad.go +++ b/test/support/mcad.go @@ -26,7 +26,7 @@ import ( func AppWrapper(t Test, namespace *corev1.Namespace, name string) func(g gomega.Gomega) *mcadv1beta1.AppWrapper { return func(g gomega.Gomega) *mcadv1beta1.AppWrapper { - aw, err := t.Client().MCAD().ArbV1().AppWrappers(namespace.Name).Get(name, metav1.GetOptions{}) + aw, err := t.Client().MCAD().McadV1beta1().AppWrappers(namespace.Name).Get(t.Ctx(), name, metav1.GetOptions{}) g.Expect(err).NotTo(gomega.HaveOccurred()) return aw }