From abdebf594e980d76d9846644636aa56adb7f156f Mon Sep 17 00:00:00 2001 From: David Grove Date: Thu, 18 Apr 2024 18:21:06 -0400 Subject: [PATCH] Remove dangling MCAD and InstaScale references Cleanup a few MCAD/InstaScale references missed in c771aae4. --- CONTRIBUTING.md | 10 ---------- README.md | 8 ++------ .../codeflare-operator.clusterserviceversion.yaml | 2 -- main.go | 12 ++++-------- 4 files changed, 6 insertions(+), 26 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 8613b92f..3d7bf8d3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -14,15 +14,6 @@ The following should be installed in your working environment: ## Basic Overview The main entrypoint for the operator is `main.go` -The MCAD and InstaScale custom resources are defined under the `api` dir: - - See `mcad_types.go` and `instascale_types.go` - -The MCAD and InstaScale resource templates can be found under `config/internal`: - - Sorted under `mcad` and `instascale` subdirs - -The code for MCAD/InstaScale resource reconcilliation can be found in the `controllers` dir: - - See `mcad_controller.go` and `instascale_controller.go` - ## Building and Deployment If changes are made in the `api` dir, run: `make manifests` - This will generate new CRDs and associated files @@ -53,7 +44,6 @@ The CodeFlare Operator currently has unit tests and pre-commit checks - Note that both are required for CI to pass on pull requests To write and inspect unit tests: - - MCAD and InstaScale unit tests under `mcad_controller_test.go` and `instascale_controller_test.go` in the `controllers` dir - Unit test functions are defined in `suite_test.go` (with utils in `util/util.go`) in the `controllers dir` - Test cases defined under `controllers/testdata` diff --git a/README.md b/README.md index ef2b44d5..423fb974 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # codeflare-operator -Operator for installation and lifecycle management of CodeFlare distributed workload stack, starting with MCAD and InstaScale +Operator for installation and lifecycle management of CodeFlare distributed workload stack. @@ -9,9 +9,7 @@ CodeFlare Stack Compatibility Matrix | Component | Version | |------------------------------|---------------------------------------------------------------------------------------------------| | CodeFlare Operator | [v1.3.1](https://github.com/project-codeflare/codeflare-operator/releases/tag/v1.3.1) | -| Multi-Cluster App Dispatcher | [v1.40.0](https://github.com/project-codeflare/multi-cluster-app-dispatcher/releases/tag/v1.40.0) | | CodeFlare-SDK | [v0.15.1](https://github.com/project-codeflare/codeflare-sdk/releases/tag/v0.15.1) | -| InstaScale | [v0.4.0](https://github.com/project-codeflare/instascale/releases/tag/v0.4.0) | | KubeRay | [v1.0.0](https://github.com/opendatahub-io/kuberay/releases/tag/v1.0.0) | @@ -90,7 +88,7 @@ The e2e tests can be executed locally by running the following commands: To properly run e2e tests on disconnected cluster user has to provide additional environment variables to properly configure testing environment: -- `CODEFLARE_TEST_PYTORCH_IMAGE` - image tag for image used to run training job using MCAD +- `CODEFLARE_TEST_PYTORCH_IMAGE` - image tag for image used to run training job - `CODEFLARE_TEST_RAY_IMAGE` - image tag for Ray cluster image - `MNIST_DATASET_URL` - URL where MNIST dataset is available - `PIP_INDEX_URL` - URL where PyPI server with needed dependencies is running @@ -118,8 +116,6 @@ For ODH tests additional environment variables are needed: There may be instances in which a new CodeFlare stack release requires releases of only a subset of the stack components. Examples could be hotfixes for a specific component. In these instances: 1. Build updated components as needed: - - Build and release [MCAD](https://github.com/project-codeflare/multi-cluster-app-dispatcher) - - Build and release [InstaScale](https://github.com/project-codeflare/instascale) - Build and release [CodeFlare-SDK](https://github.com/project-codeflare/codeflare-sdk) 2. Invoke [tag-and-build.yml](https://github.com/project-codeflare/codeflare-operator/actions/workflows/tag-and-build.yml) GitHub action, this action will create a repository tag, build and push operator image. diff --git a/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml b/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml index 04a0b301..f47cdd1a 100644 --- a/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml +++ b/config/manifests/bases/codeflare-operator.clusterserviceversion.yaml @@ -72,9 +72,7 @@ spec: keywords: - Pipelines - Scaling - - MCAD - App - - InstaScale - Jobs links: - name: Codeflare Operator diff --git a/main.go b/main.go index 7eff5fc4..b1aa0a91 100644 --- a/main.go +++ b/main.go @@ -56,12 +56,10 @@ import ( ) var ( - scheme = runtime.NewScheme() - setupLog = ctrl.Log.WithName("setup") - OperatorVersion = "UNKNOWN" - McadVersion = "UNKNOWN" - InstaScaleVersion = "UNKNOWN" - BuildDate = "UNKNOWN" + scheme = runtime.NewScheme() + setupLog = ctrl.Log.WithName("setup") + OperatorVersion = "UNKNOWN" + BuildDate = "UNKNOWN" ) func init() { @@ -90,8 +88,6 @@ func main() { setupLog.Info("Build info", "operatorVersion", OperatorVersion, - "mcadVersion", McadVersion, - "instaScaleVersion", InstaScaleVersion, "date", BuildDate, )