Skip to content
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.

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

Rhoai cleanup #343

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion openshift-ai

This file was deleted.

4 changes: 2 additions & 2 deletions rhods-operator/INFO.md → openshift-ai/INFO.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# rhods-operator
# openshift-ai

Red Hat OpenShift AI is a complete platform for the entire lifecycle of your AI/ML projects.

Expand All @@ -16,7 +16,7 @@ Finally, thanks to the operator-driven deployment and updates, the administrativ
* 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.
* Model Serving using ModelMesh and KServe.
* Ability to use other runtimes for serving
* Model Monitoring
* Distributed workloads (KubeRay, CodeFlare, Kueue, Training Operator)
Expand Down
6 changes: 3 additions & 3 deletions rhods-operator/README.md → openshift-ai/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,13 @@ The current *overlays* available are for the following channels:
If you have cloned the `gitops-catalog` repository, you can install Red Hat OpenShift AI based on the overlay of your choice by running from the root (`gitops-catalog`) directory.

```
oc apply -k rhods-operator/operator/overlays/<channel>
oc apply -k openshift-ai/operator/overlays/<channel>
```

Or, without cloning:

```
oc apply -k https://github.com/redhat-cop/gitops-catalog/rhods-operator/operator/overlays/<channel>
oc apply -k https://github.com/redhat-cop/gitops-catalog/openshift-ai/operator/overlays/<channel>
```

As part of a different overlay in your own GitOps repo:
Expand All @@ -37,5 +37,5 @@ As part of a different overlay in your own GitOps repo:
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
resources:
- https://github.com/redhat-cop/gitops-catalog/rhods-operator/operator/overlays/<channel>?ref=main
- https://github.com/redhat-cop/gitops-catalog/openshift-ai/operator/overlays/<channel>?ref=main
```
Original file line number Diff line number Diff line change
@@ -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-nvidia-gpu
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

commonAnnotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

resources:
- ../../../operator/overlays/stable-2.10
- ../../../instance/overlays/stable-2.10
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

commonAnnotations:
argocd.argoproj.io/sync-options: SkipDryRunOnMissingResource=true

resources:
- ../../../operator/overlays/stable-2.13
- ../../../instance/overlays/stable-2.13
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# components-serving-self-signed

## Purpose
This component is designed help configure the serving specific components including the following items:

KServe
ModelMesh

This component enables KServe with a Self Signed certification that is compatible with versions prior to 2.13.

For OpenShift AI 2.13 and new, it is recommended that you use the `components-serving` instead.

## 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-serving-self-signed
```
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ spec:
components:
kserve:
managementState: Managed
defaultDeploymentMode: Serverless
serving:
ingressGateway:
certificate:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
apiVersion: kustomize.config.k8s.io/v1alpha1
kind: Component

patches:
- path: patch-datasciencecluster.yaml
target:
kind: DataScienceCluster
- path: patch-dsc-init.yaml
target:
kind: DSCInitialization

components:
- ../wait-for-servicemesh
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
kind: DataScienceCluster
apiVersion: datasciencecluster.opendatahub.io/v1
metadata:
name: default
spec:
components:
kserve:
managementState: Managed
defaultDeploymentMode: Serverless
serving:
ingressGateway:
certificate:
type: OpenShiftDefaultIngress
managementState: Managed
name: knative-serving
modelmeshserving:
managementState: Managed
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
apiVersion: dscinitialization.opendatahub.io/v1
kind: DSCInitialization
metadata:
name: default-dsci
spec:
serviceMesh:
controlPlane:
metricsCollection: Istio
name: data-science-smcp
namespace: istio-system
managementState: Managed
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,5 @@ resources:
- ../../base

components:
- ../../components/rolebinding.yaml
- ../../components/make-kubeadmin-cluster-admin
```
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ resources:
- ../../base

components:
- ../../components/components-serving
- ../../components/components-serving-self-signed
- ../../components/components-training
- ../../components/default-notebook-pvc-size
- ../../components/idle-notebook-culling
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@ resources:
- ../../base

components:
- ../../components/components-serving
- ../../components/components-serving-self-signed
- ../../components/model-server-pod-sizes
- ../../components/rhoai-dashboard-access
17 changes: 17 additions & 0 deletions openshift-ai/instance/overlays/eus-2.8/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: redhat-ods-applications

resources:
- ../../base

components:
- ../../components/components-serving-self-signed
- ../../components/components-training
- ../../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
17 changes: 17 additions & 0 deletions openshift-ai/instance/overlays/stable-2.10/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization

namespace: redhat-ods-applications

resources:
- ../../base

components:
- ../../components/components-serving-self-signed
- ../../components/components-training
- ../../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
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- op: replace
path: /spec/channel
value: stable-2.10
11 changes: 11 additions & 0 deletions openshift-ai/operator/overlays/stable/kustomization.yaml
Original file line number Diff line number Diff line change
@@ -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
1 change: 1 addition & 0 deletions rhods-operator
Loading