Skip to content

Change quota management API group version to v1alpha1 #318

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 5, 2023
Merged

Change quota management API group version to v1alpha1 #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=
Expand Down Expand Up @@ -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=
Expand Down
4 changes: 2 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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))
Expand Down