Merge remote-tracking branch 'upstream/main'

Makefile

@@ -86,15 +86,13 @@ delete-codeflare-operator-from-github: ## Delete CodeFlare operator from main br
 deploy-codeflare: ## Deploy CodeFlare
 	@echo -e "\n==> Deploying CodeFlare \n"
 	-oc create ns opendatahub
-	@while [[ -z $$(oc get customresourcedefinition kfdefs.kfdef.apps.kubeflow.org) ]]; do echo "."; sleep 10; done
-	oc apply -f https://raw.githubusercontent.com/opendatahub-io/odh-manifests/master/kfdef/odh-core.yaml -n opendatahub
-	oc apply -f https://raw.githubusercontent.com/opendatahub-io/distributed-workloads/main/codeflare-stack-kfdef.yaml -n opendatahub
+	@while [[ -z $$(oc get customresourcedefinition datascienceclusters.datasciencecluster.opendatahub.io) ]]; do echo "."; sleep 10; done
+	oc apply -f https://raw.githubusercontent.com/opendatahub-io/distributed-workloads/main/codeflare-dsc.yaml -n opendatahub
 
 .PHONY: delete-codeflare
 delete-codeflare: ## Delete CodeFlare
 	@echo -e "\n==> Deleting CodeFlare \n"
-	-oc delete -f https://raw.githubusercontent.com/opendatahub-io/odh-manifests/master/kfdef/odh-core.yaml -n opendatahub
-	-oc delete -f https://raw.githubusercontent.com/opendatahub-io/distributed-workloads/main/codeflare-stack-kfdef.yaml -n opendatahub
+	-oc delete -f https://raw.githubusercontent.com/opendatahub-io/distributed-workloads/main/codeflare-dsc.yaml -n opendatahub
 	-oc delete ns opendatahub
 
 .PHONY: deploy-codeflare-from-filesystem

Quick-Start-ODH-V2.md

@@ -128,7 +128,7 @@ To completely clean up all the CodeFlare components after an install, follow the
 
 5. Remove the CodeFlare CRDs
    ```bash
-   oc delete crd instascales.codeflare.codeflare.dev mcads.codeflare.codeflare.dev schedulingspecs.mcad.ibm.com appwrappers.mcad.ibm.com quotasubtrees.ibm.com 
+   oc delete crd instascales.codeflare.codeflare.dev mcads.codeflare.codeflare.dev quotasubtrees.quota.codeflare.dev appwrappers.workload.codeflare.dev schedulingspecs.workload.codeflare.dev
    ```
 
 ## Next Steps
@@ -138,4 +138,4 @@ And with that you have gotten started using the CodeFlare stack alongside your O
 You are now ready to try out the stack with your own machine learning workloads. If you'd like some more examples, you can also run through the existing demo code provided by the Codeflare-SDK community.
 
 * [Submit batch jobs](https://github.com/project-codeflare/codeflare-sdk/blob/main/demo-notebooks/guided-demos/2_basic_jobs.ipynb)
-* [Run an interactive session](https://github.com/project-codeflare/codeflare-sdk/blob/main/demo-notebooks/guided-demos/3_basic_interactive.ipynb)
+* [Run an interactive session](https://github.com/project-codeflare/codeflare-sdk/blob/main/demo-notebooks/guided-demos/3_basic_interactive.ipynb)

Quick-Start.md

@@ -154,7 +154,7 @@ To completely clean up all the CodeFlare components after an install, follow the
 
 5. Remove the CodeFlare CRDs
    ```bash
-   oc delete crd instascales.codeflare.codeflare.dev mcads.codeflare.codeflare.dev schedulingspecs.mcad.ibm.com appwrappers.mcad.ibm.com quotasubtrees.ibm.com 
+   oc delete crd instascales.codeflare.codeflare.dev mcads.codeflare.codeflare.dev quotasubtrees.quota.codeflare.dev appwrappers.workload.codeflare.dev schedulingspecs.workload.codeflare.dev
    ```
 
 ## Next Steps

README.md

@@ -26,7 +26,7 @@ Integration of this stack into the Open Data Hub is owned by the Distributed Wor
 | Multi-Cluster App Dispatcher | v1.34.1 |
 | CodeFlare-SDK                | v0.7.1  |
 | InstaScale                   | v0.0.8  |
-| KubeRay                      | v0.5.0  |
+| KubeRay                      | v0.6.0  |
 <!-- Compatibility Matrix end -->
 
 ## Quick Start

contrib/configuration/basic-dsc.yaml

@@ -0,0 +1,26 @@
+apiVersion: datasciencecluster.opendatahub.io/v1alpha1
+kind: DataScienceCluster
+metadata:
+  labels:
+    app.kubernetes.io/created-by: opendatahub-operator
+    app.kubernetes.io/instance: default
+    app.kubernetes.io/managed-by: kustomize
+    app.kubernetes.io/name: datasciencecluster
+    app.kubernetes.io/part-of: opendatahub-operator
+  name: example-dsc
+spec:
+  components:
+    codeflare:
+      enabled: false
+    dashboard:
+      enabled: true
+    datasciencepipelines:
+      enabled: false
+    kserve:
+      enabled: false
+    modelmeshserving:
+      enabled: false
+    ray:
+      enabled: false
+    workbenches:
+      enabled: true

contrib/configuration/opendatahub-operator-subscription.yaml

@@ -6,7 +6,7 @@ metadata:
     operators.coreos.com/opendatahub-operator.openshift-operators: ''
   namespace: openshift-operators
 spec:
-  channel: rolling
+  channel: fast
   name: opendatahub-operator
   installPlanApproval: Automatic
   source: community-operators

ray/operator/base/params.env

@@ -1,2 +1,2 @@
 namespace=opendatahub
-odh-kuberay-operator-controller-image=quay.io/opendatahub/kuberay-operator:v0.5.0
+odh-kuberay-operator-controller-image=quay.io/kuberay/operator:v0.6.0