Skip to content

Commit c771aae

Browse files
dgrove-ossdgrove-oss
authored
Clean removal of MCADv1 and Instascale (#501)
* Clean removal of MCAD and Instascale * entirely remove the MCAD/Instascale config structs * untested port of odh ray test to non-appwrapper version
1 parent be7ac07 commit c771aae

21 files changed

+39
-1790
lines changed

Diff for: ‎Makefile

-18
Original file line numberDiff line numberDiff line change
@@ -11,16 +11,6 @@ PREVIOUS_VERSION ?= v0.0.0-dev
1111
VERSION ?= v0.0.0-dev
1212
BUNDLE_VERSION ?= $(VERSION:v%=%)
1313

14-
# INSTASCALE_VERSION defines the default version of the InstaScale controller
15-
INSTASCALE_VERSION ?= v0.4.0
16-
INSTASCALE_REPO ?= github.com/project-codeflare/instascale
17-
18-
# MCAD_VERSION defines the default version of the MCAD controller
19-
MCAD_VERSION ?= v1.40.0
20-
MCAD_REPO ?= github.com/project-codeflare/multi-cluster-app-dispatcher
21-
# Upstream MCAD is currently only creating release tags of the form `vX.Y.Z` (i.e the version)
22-
MCAD_CRD ?= ${MCAD_REPO}/config/crd?ref=${MCAD_VERSION}
23-
2414
# KUBERAY_VERSION defines the default version of the KubeRay operator (used for testing)
2515
KUBERAY_VERSION ?= v1.0.0
2616

@@ -139,9 +129,6 @@ help: ## Display this help.
139129
.PHONY: manifests
140130
manifests: controller-gen kustomize install-yq ## Generate RBAC objects.
141131
$(CONTROLLER_GEN) rbac:roleName=manager-role webhook paths="./..."
142-
$(SED) -i -E "s|(- )\${MCAD_REPO}.*|\1\${MCAD_CRD}|" config/crd/mcad/kustomization.yaml
143-
$(KUSTOMIZE) build config/crd/mcad | $(YQ) -s '"crd-" + .spec.names.singular' --no-doc
144-
mv crd-*.yml config/crd
145132

146133
.PHONY: fmt
147134
fmt: ## Run go fmt against code.
@@ -156,8 +143,6 @@ vet: ## Run go vet against code.
156143

157144
.PHONY: modules
158145
modules: ## Update Go dependencies.
159-
go get $(MCAD_REPO)@$(MCAD_VERSION)
160-
go get $(INSTASCALE_REPO)@$(INSTASCALE_VERSION)
161146
go get github.com/ray-project/kuberay/ray-operator@$(KUBERAY_VERSION)
162147
go mod tidy
163148

@@ -166,8 +151,6 @@ build: fmt vet ## Build manager binary.
166151
go build \
167152
-ldflags " \
168153
-X 'main.OperatorVersion=$(BUILD_VERSION)' \
169-
-X 'main.McadVersion=$(MCAD_VERSION)' \
170-
-X 'main.InstaScaleVersion=$(INSTASCALE_VERSION)' \
171154
-X 'main.BuildDate=$(BUILD_DATE)' \
172155
" \
173156
-o bin/manager main.go
@@ -208,7 +191,6 @@ deploy: manifests kustomize ## Deploy controller to the K8s cluster specified in
208191

209192
.PHONY: undeploy
210193
undeploy: ## Undeploy controller from the K8s cluster specified in ~/.kube/config. Call with ignore-not-found=true to ignore resource not found errors during deletion.
211-
$(SED) -i -E "s|(- )\${MCAD_REPO}.*|\1\${MCAD_CRD}|" config/crd/mcad/kustomization.yaml
212194
$(KUSTOMIZE) build config/${ENV} | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
213195
git restore config/*
214196

Diff for: ‎config/crd/crd-appwrapper.yml

-462
This file was deleted.

Diff for: ‎config/crd/crd-quotasubtree.yml

-115
This file was deleted.

Diff for: ‎config/crd/crd-schedulingspec.yml

-80
This file was deleted.

Diff for: ‎config/crd/kustomization.yaml

-3
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,5 @@
22
# since it depends on service name and namespace that are out of this kustomize package.
33
# It should be run by config/default
44
resources:
5-
- crd-appwrapper.yml
6-
- crd-quotasubtree.yml
7-
- crd-schedulingspec.yml
85

96
#+kubebuilder:scaffold:crdkustomizeresource

Diff for: ‎config/crd/mcad/kustomization.yaml

-4
This file was deleted.

Diff for: ‎config/e2e/config.yaml

-8
This file was deleted.

Diff for: ‎config/e2e/kustomization.yaml

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
namespace: openshift-operators
22

33
bases:
4-
- config.yaml
54
- ../default
65

76
patches:

Diff for: ‎go.mod

+2-44
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@ require (
88
github.com/openshift/api v0.0.0-20230213134911-7ba313770556
99
github.com/openshift/client-go v0.0.0-20221019143426-16aed247da5c
1010
github.com/project-codeflare/codeflare-common v0.0.0-20240207083912-d7a229270a0a
11-
github.com/project-codeflare/instascale v0.4.0
12-
github.com/project-codeflare/multi-cluster-app-dispatcher v1.40.0
1311
github.com/ray-project/kuberay/ray-operator v1.0.0
1412
go.uber.org/zap v1.26.0
1513
k8s.io/api v0.27.8
@@ -25,25 +23,16 @@ require (
2523
replace sigs.k8s.io/custom-metrics-apiserver => sigs.k8s.io/custom-metrics-apiserver v1.25.1-0.20230306170449-63d8c93851f3
2624

2725
require (
28-
github.com/NYTimes/gziphandler v1.1.1 // indirect
29-
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
30-
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3126
github.com/aymerick/douceur v0.2.0 // indirect
3227
github.com/beorn7/perks v1.0.1 // indirect
33-
github.com/blang/semver/v4 v4.0.0 // indirect
3428
github.com/cenkalti/backoff/v4 v4.2.1 // indirect
3529
github.com/cespare/xxhash/v2 v2.2.0 // indirect
36-
github.com/coreos/go-semver v0.3.0 // indirect
37-
github.com/coreos/go-systemd/v22 v22.4.0 // indirect
3830
github.com/davecgh/go-spew v1.1.1 // indirect
39-
github.com/eapache/go-resiliency v1.3.0 // indirect
4031
github.com/emicklei/go-restful/v3 v3.10.1 // indirect
4132
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
4233
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
43-
github.com/felixge/httpsnoop v1.0.3 // indirect
4434
github.com/fsnotify/fsnotify v1.6.0 // indirect
4535
github.com/go-logr/logr v1.2.4 // indirect
46-
github.com/go-logr/stdr v1.2.2 // indirect
4736
github.com/go-logr/zapr v1.2.4 // indirect
4837
github.com/go-openapi/jsonpointer v0.19.6 // indirect
4938
github.com/go-openapi/jsonreference v0.20.1 // indirect
@@ -54,76 +43,45 @@ require (
5443
github.com/golang/glog v1.1.2 // indirect
5544
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5645
github.com/golang/protobuf v1.5.3 // indirect
57-
github.com/google/cel-go v0.12.7 // indirect
5846
github.com/google/gnostic v0.6.9 // indirect
5947
github.com/google/go-cmp v0.5.9 // indirect
6048
github.com/google/gofuzz v1.2.0 // indirect
6149
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
6250
github.com/google/uuid v1.3.0 // indirect
6351
github.com/gorilla/css v1.0.0 // indirect
64-
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
65-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
66-
github.com/hashicorp/errwrap v1.0.0 // indirect
67-
github.com/hashicorp/go-multierror v1.1.1 // indirect
6852
github.com/imdario/mergo v0.3.12 // indirect
69-
github.com/inconshreveable/mousetrap v1.1.0 // indirect
7053
github.com/josharian/intern v1.0.0 // indirect
7154
github.com/json-iterator/go v1.1.12 // indirect
7255
github.com/mailru/easyjson v0.7.7 // indirect
7356
github.com/microcosm-cc/bluemonday v1.0.18 // indirect
74-
github.com/mitchellh/mapstructure v1.4.1 // indirect
7557
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
7658
github.com/modern-go/reflect2 v1.0.2 // indirect
7759
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
7860
github.com/openshift-online/ocm-sdk-go v0.1.368 // indirect
7961
github.com/pkg/errors v0.9.1 // indirect
62+
github.com/project-codeflare/multi-cluster-app-dispatcher v1.37.0 // indirect
8063
github.com/prometheus/client_golang v1.18.0 // indirect
8164
github.com/prometheus/client_model v0.5.0 // indirect
8265
github.com/prometheus/common v0.46.0 // indirect
8366
github.com/prometheus/procfs v0.12.0 // indirect
84-
github.com/spf13/cobra v1.7.0 // indirect
8567
github.com/spf13/pflag v1.0.5 // indirect
86-
github.com/stoewer/go-strcase v1.2.0 // indirect
87-
go.etcd.io/etcd/api/v3 v3.5.7 // indirect
88-
go.etcd.io/etcd/client/pkg/v3 v3.5.7 // indirect
89-
go.etcd.io/etcd/client/v3 v3.5.7 // indirect
90-
go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.45.0 // indirect
91-
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.45.0 // indirect
92-
go.opentelemetry.io/otel v1.19.0 // indirect
93-
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.19.0 // indirect
94-
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.19.0 // indirect
95-
go.opentelemetry.io/otel/metric v1.19.0 // indirect
96-
go.opentelemetry.io/otel/sdk v1.19.0 // indirect
97-
go.opentelemetry.io/otel/trace v1.19.0 // indirect
98-
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
68+
github.com/stretchr/testify v1.8.4 // indirect
9969
go.uber.org/multierr v1.10.0 // indirect
100-
golang.org/x/crypto v0.18.0 // indirect
10170
golang.org/x/net v0.20.0 // indirect
10271
golang.org/x/oauth2 v0.16.0 // indirect
103-
golang.org/x/sync v0.3.0 // indirect
10472
golang.org/x/sys v0.16.0 // indirect
10573
golang.org/x/term v0.16.0 // indirect
10674
golang.org/x/text v0.14.0 // indirect
10775
golang.org/x/time v0.3.0 // indirect
10876
golang.org/x/tools v0.12.0 // indirect
10977
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
11078
google.golang.org/appengine v1.6.7 // indirect
111-
google.golang.org/genproto v0.0.0-20230711160842-782d3b101e98 // indirect
112-
google.golang.org/genproto/googleapis/api v0.0.0-20230711160842-782d3b101e98 // indirect
113-
google.golang.org/genproto/googleapis/rpc v0.0.0-20230711160842-782d3b101e98 // indirect
114-
google.golang.org/grpc v1.58.3 // indirect
11579
google.golang.org/protobuf v1.32.0 // indirect
11680
gopkg.in/inf.v0 v0.9.1 // indirect
117-
gopkg.in/natefinch/lumberjack.v2 v2.0.0 // indirect
11881
gopkg.in/yaml.v2 v2.4.0 // indirect
11982
gopkg.in/yaml.v3 v3.0.1 // indirect
12083
k8s.io/apiextensions-apiserver v0.27.7 // indirect
121-
k8s.io/apiserver v0.27.8 // indirect
122-
k8s.io/kms v0.27.8 // indirect
12384
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
124-
k8s.io/metrics v0.26.2 // indirect
125-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.1.2 // indirect
126-
sigs.k8s.io/custom-metrics-apiserver v0.0.0 // indirect
12785
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
12886
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
12987
)

0 commit comments

Comments
 (0)