diff --git a/Makefile b/Makefile index facbf2cd7..c7b102562 100644 --- a/Makefile +++ b/Makefile @@ -16,7 +16,7 @@ INSTASCALE_VERSION ?= v0.0.9 INSTASCALE_REPO ?= github.com/project-codeflare/instascale # MCAD_VERSION defines the default version of the MCAD controller -MCAD_VERSION ?= v1.35.0 +MCAD_VERSION ?= 725a614debe3d34d1547c1659ef5ad49f8f6c5df 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) MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_VERSION} diff --git a/go.mod b/go.mod index c1caf36cd..a45a9f188 100644 --- a/go.mod +++ b/go.mod @@ -7,8 +7,8 @@ require ( github.com/openshift/api v0.0.0-20230213134911-7ba313770556 github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c github.com/project-codeflare/instascale v0.0.9 - github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.0 - github.com/ray-project/kuberay/ray-operator v0.0.0-20230920050528-dfdc51a88b6d + github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.1-0.20231004084320-725a614debe3 + github.com/ray-project/kuberay/ray-operator v0.0.0-20231003160009-38e3527cfce7 go.uber.org/zap v1.26.0 k8s.io/api v0.26.3 k8s.io/apimachinery v0.26.3 diff --git a/go.sum b/go.sum index 2c06b07d6..572e3fb50 100644 --- a/go.sum +++ b/go.sum @@ -391,8 +391,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/project-codeflare/instascale v0.0.9 h1:XlwprvuJNbNVnLxCa6lPz5bKUEMhJprVRumd42sRhVY= github.com/project-codeflare/instascale v0.0.9/go.mod h1:fpc8TiFvR2r0duKFbKmGTshEGa0eGK9noWWfjhPxphE= -github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.0 h1:7Ks2+6Jd8tnwymSmSrwNb/CpAPmgS0lNIhMlj6DrT+o= -github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.0/go.mod h1:Yge6GRNpO9YIDfeL+XOcCE9xbmfCTD5C1h5dlW87mxQ= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.1-0.20231004084320-725a614debe3 h1:l/QHuyrSgaZfZ1UCRjj49rhagJV7tsyNlq0+lRhS6ZM= +github.com/project-codeflare/multi-cluster-app-dispatcher v1.35.1-0.20231004084320-725a614debe3/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 v1.0.0/go.mod h1:db9x61etRT2tGnBNRi70OPL5FsnadC4Ky3P0J6CfImo= github.com/prometheus/client_golang v1.7.1/go.mod h1:PY5Wy2awLA44sXw4AOSfFBetzPP4j5+D6mVACh+pe2M= @@ -420,8 +420,8 @@ github.com/prometheus/procfs v0.6.0/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1 github.com/prometheus/procfs v0.7.3/go.mod h1:cz+aTbrPOrUb4q7XlbU9ygM+/jj0fzG6c1xBZuNvfVA= 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/ray-project/kuberay/ray-operator v0.0.0-20230920050528-dfdc51a88b6d h1:qrCTwTnba5lQMiV6dYimR8epl8Ju90U+QLbmRQ4pe9k= -github.com/ray-project/kuberay/ray-operator v0.0.0-20230920050528-dfdc51a88b6d/go.mod h1:NDvscwYbeLSh+Cfc2UTeyPWODtNKPCsPjD/2kg3ZXPw= +github.com/ray-project/kuberay/ray-operator v0.0.0-20231003160009-38e3527cfce7 h1:arS5d3gMlpVJTcBipREs6uOWP4mL7C0EtQutISpC4Mo= +github.com/ray-project/kuberay/ray-operator v0.0.0-20231003160009-38e3527cfce7/go.mod h1:NDvscwYbeLSh+Cfc2UTeyPWODtNKPCsPjD/2kg3ZXPw= 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= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= diff --git a/main.go b/main.go index 385a7d958..6173b8533 100644 --- a/main.go +++ b/main.go @@ -27,7 +27,7 @@ import ( instascale "github.com/project-codeflare/instascale/controllers" instascaleconfig "github.com/project-codeflare/instascale/pkg/config" mcadv1beta1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/controller/v1beta1" - quotasubtreev1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1" + quotasubtreev1alpha1 "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/apis/quotaplugins/quotasubtree/v1alpha1" mcadconfig "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/config" mcad "github.com/project-codeflare/multi-cluster-app-dispatcher/pkg/controller/queuejob" "go.uber.org/zap/zapcore" @@ -66,7 +66,7 @@ func init() { utilruntime.Must(clientgoscheme.AddToScheme(scheme)) // MCAD utilruntime.Must(mcadv1beta1.AddToScheme(scheme)) - utilruntime.Must(quotasubtreev1.AddToScheme(scheme)) + utilruntime.Must(quotasubtreev1alpha1.AddToScheme(scheme)) // InstaScale utilruntime.Must(configv1.Install(scheme)) utilruntime.Must(machinev1beta1.Install(scheme))