diff --git a/Makefile b/Makefile index 6e1045257..8f39a9bc5 100644 --- a/Makefile +++ b/Makefile @@ -12,12 +12,12 @@ VERSION ?= v0.0.0-dev BUNDLE_VERSION ?= $(VERSION:v%=%) # INSTASCALE_VERSION defines the default version of the InstaScale controller -INSTASCALE_VERSION ?= dev +INSTASCALE_VERSION ?= v0.0.8 # MCAD_VERSION defines the default version of the MCAD controller -MCAD_VERSION ?= main +MCAD_VERSION ?= v1.34.1 # MCAD_REF, MCAD_REPO and MCAD_CRD define the reference to MCAD CRD resources -MCAD_REF ?= dev +MCAD_REF ?= release-${MCAD_VERSION} MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher # Upstream MCAD is currently only creating release tags of the form `vX.Y.Z` (i.e the version) # The image is still published using the MCAD_REF format (i.e release-vX.Y.Z) @@ -30,7 +30,7 @@ KUBERAY_VERSION ?= v0.5.0 RAY_VERSION ?= 2.5.0 # CODEFLARE_SDK_VERSION defines the default version of the CodeFlare SDK -CODEFLARE_SDK_VERSION ?= 0.7.0 +CODEFLARE_SDK_VERSION ?= 0.7.1 # OPERATORS_REPO_ORG points to GitHub repository organization where bundle PR is opened against # OPERATORS_REPO_FORK_ORG points to GitHub repository fork organization where bundle build is pushed to diff --git a/README.md b/README.md index 685e85f21..0f74b5b84 100644 --- a/README.md +++ b/README.md @@ -8,10 +8,10 @@ CodeFlare Stack Compatibility Matrix | Component | Version | |------------------------------|---------| -| CodeFlare Operator | v0.2.2 | -| Multi-Cluster App Dispatcher | v1.34.0 | -| CodeFlare-SDK | v0.7.0 | -| InstaScale | v0.0.7 | +| CodeFlare Operator | v0.2.3 | +| Multi-Cluster App Dispatcher | v1.34.1 | +| CodeFlare-SDK | v0.7.1 | +| InstaScale | v0.0.8 | | KubeRay | v0.5.0 | diff --git a/controllers/defaults.go b/controllers/defaults.go index bac326fde..9f28b3c19 100644 --- a/controllers/defaults.go +++ b/controllers/defaults.go @@ -5,6 +5,6 @@ package controllers // *********************** const ( - MCADImage = "quay.io/project-codeflare/mcad-controller:dev" - InstaScaleImage = "quay.io/project-codeflare/instascale-controller:dev" + MCADImage = "quay.io/project-codeflare/mcad-controller:release-v1.34.1" + InstaScaleImage = "quay.io/project-codeflare/instascale-controller:v0.0.8" ) diff --git a/controllers/testdata/instascale_test_results/case_1/deployment.yaml b/controllers/testdata/instascale_test_results/case_1/deployment.yaml index 4e3c3078f..4587ba198 100644 --- a/controllers/testdata/instascale_test_results/case_1/deployment.yaml +++ b/controllers/testdata/instascale_test_results/case_1/deployment.yaml @@ -19,7 +19,7 @@ spec: - name: instascale args: - "--configs-namespace=default" - image: quay.io/project-codeflare/instascale-controller:v0.0.7 + image: quay.io/project-codeflare/instascale-controller:v0.0.8 resources: limits: cpu: '2' diff --git a/controllers/testdata/instascale_test_results/case_2/deployment.yaml b/controllers/testdata/instascale_test_results/case_2/deployment.yaml index bb8eeeea8..f5b353ffc 100644 --- a/controllers/testdata/instascale_test_results/case_2/deployment.yaml +++ b/controllers/testdata/instascale_test_results/case_2/deployment.yaml @@ -19,7 +19,7 @@ spec: - name: instascale args: - "--configs-namespace=default" - image: quay.io/project-codeflare/instascale-controller:v0.0.7 + image: quay.io/project-codeflare/instascale-controller:v0.0.8 resources: limits: cpu: '1' diff --git a/go.mod b/go.mod index c621d70ce..07fe60ac9 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.34.1-0.20230831150053-05b1af83014c - github.com/ray-project/kuberay/ray-operator v0.0.0-20230830082034-e7fbf7d73576 + github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1 + github.com/ray-project/kuberay/ray-operator v0.0.0-20230908233208-a8f730e5a2b6 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 a87dbc9cb..c59002f73 100644 --- a/go.sum +++ b/go.sum @@ -495,8 +495,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.34.1-0.20230831150053-05b1af83014c h1:LjCgRcjtkd9byePczvxGBLjdM22M2BCTB76FoEk2fkU= -github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1-0.20230831150053-05b1af83014c/go.mod h1:gtTl8Tsl+X+bGhqVudLoveINR6IkN+sVvH0J+VZIP40= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1 h1:ZNQ/JPdjS6CtaAzt6SNqaoWcpwS1PyVdgZlmIYikPLI= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.34.1/go.mod h1:Yge6GRNpO9YIDfeL+XOcCE9xbmfCTD5C1h5dlW87mxQ= 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= @@ -528,8 +528,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-20230830082034-e7fbf7d73576 h1:NYt+ipGo+jMLYCFI5S04DzVFSXn8WCR0m6m3bFXPk+4= -github.com/ray-project/kuberay/ray-operator v0.0.0-20230830082034-e7fbf7d73576/go.mod h1:7PBzsR4L0b/f5tTxq1XGnzvudbrMyPadiLiNiP9pOl0= +github.com/ray-project/kuberay/ray-operator v0.0.0-20230908233208-a8f730e5a2b6 h1:NP7S29MtvEH4zD0oawHqGE/DXu5uYbGvXQq6mh5+3Kk= +github.com/ray-project/kuberay/ray-operator v0.0.0-20230908233208-a8f730e5a2b6/go.mod h1:NDvscwYbeLSh+Cfc2UTeyPWODtNKPCsPjD/2kg3ZXPw= github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= diff --git a/test/support/defaults.go b/test/support/defaults.go index c87b5b1a6..66f364841 100644 --- a/test/support/defaults.go +++ b/test/support/defaults.go @@ -5,7 +5,7 @@ package support // *********************** const ( - CodeFlareSDKVersion = "0.6.1" + CodeFlareSDKVersion = "0.7.1" RayVersion = "2.5.0" RayImage = "rayproject/ray:2.5.0" )