redhat-cop · strangiato · Dec 9, 2024 · Nov 24, 2024 · Nov 27, 2024
@@ -12,11 +12,13 @@ Finally, thanks to the operator-driven deployment and updates, the administrativ
 
 ### Components
 * Dashboard
-* Curated Workbench Images (incl CUDA, PyTorch, Tensorflow, code-server)
+* Curated Workbench Images (including CUDA, PyTorch, TensorFlow, code-server, TrustyAI)
 * Ability to add Custom Images
 * Ability to leverage accelerators (such as NVIDIA GPU)
 * Data Science Pipelines (including Elyra notebook interface)
 * Model Serving using ModelMesh and Kserve.
 * Ability to use other runtimes for serving
 * Model Monitoring
-* Distributed workloads (KubeRay, CodeFlare, Kueue)
+* Distributed workloads (KubeRay, CodeFlare, Kueue, Training Operator)
+* XAI explanations of predictive models (TrustyAI)
+* Index and manage models, versions, and artifacts metadata (Model Registry)
@@ -10,9 +10,12 @@ The current *overlays* available are for the following channels:
 * [beta](operator/overlays/beta)
 * [embedded](operator/overlays/embedded)
 * [eus-2.8](operator/overlays/eus-2.8)
+* [eus-2.16](operator/overlays/eus-2.16)
 * [fast](operator/overlays/fast)
 * [stable](operator/overlays/stable)
 * [stable-2.8](operator/overlays/stable-2.8)
+* [stable-2.13](operator/overlays/stable-2.13)
+* [stable-2.16](operator/overlays/stable-2.16)
 
 ## Usage
 

@@ -0,0 +1,9 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+commonAnnotations:
+  argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true
+
+resources:
+  - ../../../operator/overlays/eus-2.16
+  - ../../../instance/overlays/eus-2.16
diff --git a/rhods-operator/instance/base/datasciencecluster.yaml b/rhods-operator/instance/base/datasciencecluster.yaml
@@ -1,7 +1,7 @@
 kind: DataScienceCluster
 apiVersion: datasciencecluster.opendatahub.io/v1
 metadata:
-  name: default
+  name: default-dsc
 spec:
   components:
     codeflare:

@@ -5,6 +5,7 @@ This component is designed help configure the distributed compute specific compo
 
 CodeFlare
 Ray
+Kueue
 
 The Distributed Compute Components are Generally Available as of RHOAI 2.9.
 

diff --git a/...operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml b/...operator/instance/components/components-distributed-compute/patch-datasciencecluster.yaml
@@ -1,7 +1,7 @@
 kind: DataScienceCluster
 apiVersion: datasciencecluster.opendatahub.io/v1
 metadata:
-  name: default
+  name: default-dsc
 spec:
   components:
     codeflare:

@@ -0,0 +1,19 @@
+# components-distributed-compute
+
+## Purpose
+This component is designed help index and manage models, versions, and artifacts metadata
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/components-modelregistry
+```
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: patch-datasciencecluster.yaml
+    target:
+      kind: DataScienceCluster
@@ -0,0 +1,9 @@
+kind: DataScienceCluster
+apiVersion: datasciencecluster.opendatahub.io/v1
+metadata:
+  name: default-dsc
+spec:
+  components:
+    modelregistry:
+      managementState: Managed
+      registriesNamespace: rhoai-model-registries
@@ -20,3 +20,5 @@ resources:
 components:
   - ../../components/components-serving
 ```
+
+You can customize the PVC size by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file.
@@ -1,11 +1,12 @@
 kind: DataScienceCluster
 apiVersion: datasciencecluster.opendatahub.io/v1
 metadata:
-  name: default
+  name: default-dsc
 spec:
   components:
     kserve:
       managementState: Managed
+      defaultDeploymentMode: Serverless
       serving:
         ingressGateway:
           certificate:

@@ -19,4 +19,4 @@ resources:
 
 components:
   - ../../components/components-training
-```
+```
diff --git a/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml b/rhods-operator/instance/components/components-training/patch-datasciencecluster.yaml
@@ -1,7 +1,7 @@
 kind: DataScienceCluster
 apiVersion: datasciencecluster.opendatahub.io/v1
 metadata:
-  name: default
+  name: default-dsc
 spec:
   components:
     datasciencepipelines:

@@ -0,0 +1,20 @@
+# components-distributed-compute
+
+## Purpose
+This component is designed help XAI explanations of predictive models.
+The TrustyAI Components are Generally Available as of RHOAI 2.15.
+
+## Usage
+
+This component can be added to a base by adding the `components` section to your overlay `kustomization.yaml` file:
+
+```
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/components-trustyai
+```
@@ -0,0 +1,7 @@
+apiVersion: kustomize.config.k8s.io/v1alpha1
+kind: Component
+
+patches:
+  - path: patch-datasciencecluster.yaml
+    target:
+      kind: DataScienceCluster
@@ -0,0 +1,8 @@
+kind: DataScienceCluster
+apiVersion: datasciencecluster.opendatahub.io/v1
+metadata:
+  name: default-dsc
+spec:
+  components:
+    trustyai:
+      managementState: Managed
@@ -17,7 +17,5 @@ resources:
   - ../../base
 
 components:
-  - ../../components/idle-notebook-culling
-```
-
-You can customize the time notebooks can remain running while inactive by updating the [culler-config.yaml](./culler-config.yaml) file.
+  - ../../components/rolebinding.yaml
+```
@@ -19,5 +19,3 @@ resources:
 components:
   - ../../components/nvidia-gpu-accelerator-profile
 ```
-
-You can customize the pod sizes by updating the [patch-rhoai-dashboard.yaml](./patch-rhoai-dashboard.yaml) file.
@@ -4,12 +4,9 @@ set -e
 TIMEOUT_SECONDS=60
 
 wait_for_service_mesh(){
-  echo "Checking status of all service_mesh pre-reqs"
+  echo "Checking status of all service_mesh and serverless and serverless pre-reqs"
   SERVICEMESH_RESOURCES=(
-    crd/kialis.kiali.io:condition=established \
-    crd/jaegers.jaegertracing.io:condition=established \
-    crd/elasticsearches.logging.openshift.io:condition=established \
-    crd/knativeservings.operator.knative.dev:condition=established \
+    crd/knativeservings.operator.knative.dev:condition=established
     crd/servicemeshcontrolplanes.maistra.io:condition=established \
   )
 

@@ -0,0 +1,10 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/wait-for-servicemesh
+  - ../../components/components-modelregistry
+  - ../../components/rhoai-dashboard-access
@@ -0,0 +1,20 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: redhat-ods-applications
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/components-serving
+  - ../../components/components-training
+  - ../../components/components-trustyai
+  - ../../components/default-notebook-pvc-size
+  - ../../components/idle-notebook-culling
+  - ../../components/notebook-pod-sizes
+  - ../../components/nvidia-gpu-accelerator-profile
+  - ../../components/make-kubeadmin-cluster-admin
+  - ../../components/model-server-pod-sizes
+  - ../../components/rhoai-dashboard-access
+  - ../../components/auth-with-authorino
@@ -0,0 +1,27 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+namespace: redhat-ods-applications
+
+resources:
+  - ../../base
+
+components:
+  - ../../components/components-serving
+  - ../../components/components-training
+  - ../../components/components-trustyai
+  - ../../components/default-notebook-pvc-size
+  - ../../components/idle-notebook-culling
+  - ../../components/notebook-pod-sizes
+  - ../../components/make-kubeadmin-cluster-admin
+  - ../../components/model-server-pod-sizes
+  - ../../components/rhoai-dashboard-access
+  - ../../components/auth-with-authorino
+
+
+
+patches:
+  - target:
+      kind: DataScienceCluster
+      name: default-dsc
+    path: patch-cert.yaml
diff --git a/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml.yaml b/rhods-operator/instance/overlays/eus-2.16/patch-cert.yaml.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/components/kserve/serving/ingressGateway/certificate/type
+  value: OpenshiftDefaultIngress
@@ -9,6 +9,7 @@ components:
   - ../../components/components-distributed-compute
   - ../../components/components-serving
   - ../../components/components-training
+  - ../../components/components-trustyai
   - ../../components/default-notebook-pvc-size
   - ../../components/idle-notebook-culling
   - ../../components/notebook-pod-sizes

@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: rhods-operator
+    path: patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: eus-2.16
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: rhods-operator
+    path: patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-2.13
@@ -0,0 +1,11 @@
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../base
+
+patches:
+  - target:
+      kind: Subscription
+      name: rhods-operator
+    path: patch-channel.yaml
@@ -0,0 +1,3 @@
+- op: replace
+  path: /spec/channel
+  value: stable-2.16
-Original file line number
+Diff line change
@@ Expand Up @@
     CodeFlare
     Ray
+    Kueue
     The Distributed Compute Components are Generally Available as of RHOAI 2.9.
@@ Expand Down @@