Skip to content

Commit

Permalink
update: rebranding for rhoai from rhods
Browse files Browse the repository at this point in the history
Signed-off-by: Wen Zhou <[email protected]>
  • Loading branch information
zdtsw committed Dec 18, 2023
1 parent 508449a commit 1269e19
Show file tree
Hide file tree
Showing 10 changed files with 84 additions and 80 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ following environment variables must be set when running locally:
export KUBECONFIG=/path/to/kubeconfig
```

Ensure when testing RHODS operator in dev mode, no ODH CSV exists
Ensure when testing RHOAI operator in dev mode, no ODH CSV exists
Once the above variables are set, run the following:

```shell
Expand Down
32 changes: 17 additions & 15 deletions bundle/manifests/rhods-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion components/dashboard/dashboard.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ func (d *Dashboard) ReconcileComponent(ctx context.Context,
if err := d.deployCRDsForPlatform(cli, owner, dscispec.ApplicationsNamespace, platform); err != nil {
return fmt.Errorf("failed to deploy %s crds %s: %v", ComponentNameSupported, PathCRDs, err)
}
// Apply RHODS specific configs
// Apply RHOAI specific configs
if err := d.applyRhodsSpecificConfigs(cli, owner, dscispec.ApplicationsNamespace, platform); err != nil {
return err
}
Expand Down
22 changes: 11 additions & 11 deletions config/manifests/bases/rhods-operator.clusterserviceversion.yaml

Large diffs are not rendered by default.

22 changes: 12 additions & 10 deletions config/manifests/description-patch.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,24 @@ metadata:
name: replace-description-patch
spec:
description: |-
Red Hat OpenShift Data Science (RHODS) is a complete platform for the entire lifecycle of your AI/ML projects. It is the flagship product of OpenShift AI.
When using RHODS, your users will find all the tools they would expect from a modern AI/ML platform in an interface that is intuitive, requires no local install, and is backed by the power of your OpenShift cluster.
Red Hat OpenShift AI is a complete platform for the entire lifecycle of your AI/ML projects.
When using Red Hat OpenShift AI, your users will find all the tools they would expect from a modern AI/ML platform in an interface that is intuitive, requires no local install, and is backed by the power of your OpenShift cluster.
Your Data Scientists will feel right at home with quick and simple access to the Notebook interface they are used to. They can leverage the default Notebook Images (Including PyTorch, tensorflow, and CUDA), or add custom ones. Your MLOps engineers will be able to leverage Data Science Pipelines to easily parallelize and/or schedule the required workloads. They can then quickly serve, monitor, and update the created AI/ML models. They can do that by either using the provided out-of-the-box OpenVino Server Model Runtime or by adding their own custom serving runtime instead. These activities are tied together with the concept of Data Science Projects, simplifying both organization and collaboration.
But beyond the individual features, one of the key aspects of this platform is its flexibility. Not only can you augment it with your own Customer Workbench Image and Custom Model Serving Runtime Images, but you will also have a consistent experience across any infrastructure footprint. Be it in the public cloud, private cloud, on-premises, and even in disconnected clusters. RHODS can be installed on any supported OpenShift. It can scale out or in depending on the size of your team and its computing requirements.
But beyond the individual features, one of the key aspects of this platform is its flexibility. Not only can you augment it with your own Customer Workbench Image and Custom Model Serving Runtime Images, but you will also have a consistent experience across any infrastructure footprint. Be it in the public cloud, private cloud, on-premises, and even in disconnected clusters. Red Hat OpenShift AI can be installed on any supported OpenShift. It can scale out or in depending on the size of your team and its computing requirements.
Finally, thanks to the operator-driven deployment and updates, the administrative load of the platform is very light, leaving everyone more time to focus on the work that makes a difference.
### Components
* RHODS dashboard
* Curated Notebook Images (incl CUDA, PyTorch, Tensorflow)
* Dashboard
* Curated Workbench Images (incl CUDA, PyTorch, Tensorflow, VScode)
* Ability to add Custom Images
* Ability to leverage accelerators (such as NVIDIA GPU)
* Data Science Pipelines. (including Elyra notebook interface, and based on standard OpenShift Pipelines)
* Model Serving using ModelMesh (and Kserve) with a provided OpenVino Model Serving Runtime
* Model Serving using ModelMesh and Kserve.
* Ability to use other runtimes for serving
* Model Monitoring
* Distributed workloads (KubeRay, CodeFlare)
* XAI explanations of predictive models (TrustyAI)
4 changes: 2 additions & 2 deletions config/monitoring/alertmanager/alertmanager-configs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ data:
default.tmpl: |
{{ define "email.rhods.subject" }}
{{ if gt (len .Alerts.Firing) 1 }}
Red Hat OpenShift Data Science Notifications
Red Hat OpenShift AI Notifications
{{ else }}
{{ (index .Alerts.Firing 0).Annotations.summary }}
{{ end }}
Expand Down Expand Up @@ -550,7 +550,7 @@ data:
<td align="center" class="rh-masthead__brand" bgcolor="#151515">
<a href="https://cloud.redhat.com/" target="_blank"
class="rh-masthead__brand-link">
<img class="rh-masthead__brand-img" src="https://raw.githubusercontent.com/red-hat-data-services/odh-deployer/main/resources/logos/LogoRHODS.png" />
<img class="rh-masthead__brand-img" src="https://raw.githubusercontent.com/red-hat-data-services/odh-dashboard/main/frontend/src/images/rhods-logo.svg" />
</a>
</td>
</tr>
Expand Down
64 changes: 32 additions & 32 deletions config/monitoring/prometheus/apps/prometheus-configs.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ data:
target_label: __address__
replacement: ${1}:8080
- job_name: 'RHODS Metrics'
- job_name: 'RHOAI Metrics'
honor_labels: true
scheme: http
kubernetes_sd_configs:
Expand All @@ -333,16 +333,16 @@ data:
operator-recording.rules: |
groups:
- name: SLOs - RHODS Operator v2
- name: SLOs - RHOAI Operator v2
interval: 15m
rules:
- expr: |
rate(controller_runtime_reconcile_total{controller="dscinitialization-controller", job="RHODS Metrics", result!="success"}[15m])
rate(controller_runtime_reconcile_total{controller="dscinitialization-controller", job="RHOAI Metrics", result!="success"}[15m])
labels:
instance: dscinitialization-controller
record: controller_runtime_reconcile_total:rate15m
- expr: |
rate(controller_runtime_reconcile_total{controller="datasciencecluster-controller", job="RHODS Metrics", result!="success"}[15m])
rate(controller_runtime_reconcile_total{controller="datasciencecluster-controller", job="RHOAI Metrics", result!="success"}[15m])
labels:
instance: datasciencecluster-controller
record: controller_runtime_reconcile_total:rate15m
Expand All @@ -358,7 +358,7 @@ data:
severity: critical
namespace: redhat-ods-monitoring
annotations:
description: This is a DeadManSnitch to ensure RHODS monitoring and alerting pipeline is online.
description: This is a DeadManSnitch to ensure RHOAI monitoring and alerting pipeline is online.
summary: Alerting DeadManSnitch
codeflare-recording.rules: |
Expand Down Expand Up @@ -598,11 +598,11 @@ data:
groups:
- name: SLOs-haproxy_backend_http_responses_dashboard
rules:
- alert: RHODS Dashboard Route Error Burn Rate
- alert: RHOAI Dashboard Route Error Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.route }} (current value: {{ $value }}).'
triage: 'https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-error-burn-rate.md'
summary: RHODS Dashboard Route Error Burn Rate
summary: RHOAI Dashboard Route Error Burn Rate
expr: |
sum(haproxy_backend_http_responses_total:burnrate5m{route=~"rhods-dashboard"}) by (route) > (14.40 * (1-0.99950))
and
Expand All @@ -611,11 +611,11 @@ data:
labels:
severity: critical
namespace: redhat-ods-applications
- alert: RHODS Dashboard Route Error Burn Rate
- alert: RHOAI Dashboard Route Error Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.route }} (current value: {{ $value }}).'
triage: 'https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-error-burn-rate.md'
summary: RHODS Dashboard Route Error Burn Rate
summary: RHOAI Dashboard Route Error Burn Rate
expr: |
sum(haproxy_backend_http_responses_total:burnrate30m{route=~"rhods-dashboard"}) by (route) > (6.00 * (1-0.99950))
and
Expand All @@ -624,11 +624,11 @@ data:
labels:
severity: critical
namespace: redhat-ods-applications
- alert: RHODS Dashboard Route Error Burn Rate
- alert: RHOAI Dashboard Route Error Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.route }} (current value: {{ $value }}).'
triage: 'https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-error-burn-rate.md'
summary: RHODS Dashboard Route Error Burn Rate
summary: RHOAI Dashboard Route Error Burn Rate
expr: |
sum(haproxy_backend_http_responses_total:burnrate2h{route=~"rhods-dashboard"}) by (route) > (3.00 * (1-0.99950))
and
Expand All @@ -637,11 +637,11 @@ data:
labels:
severity: warning
namespace: redhat-ods-applications
- alert: RHODS Dashboard Route Error Burn Rate
- alert: RHOAI Dashboard Route Error Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.route }} (current value: {{ $value }}).'
triage: 'https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-error-burn-rate.md'
summary: RHODS Dashboard Route Error Burn Rate
summary: RHOAI Dashboard Route Error Burn Rate
expr: |
sum(haproxy_backend_http_responses_total:burnrate6h{route=~"rhods-dashboard"}) by (route) > (1.00 * (1-0.99950))
and
Expand All @@ -652,11 +652,11 @@ data:
namespace: redhat-ods-applications
- name: SLOs-probe_success_dashboard
rules:
- alert: RHODS Dashboard Probe Success Burn Rate
- alert: RHOAI Dashboard Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-dashboard-probe-success-burn-rate.md"
summary: RHODS Dashboard Probe Success Burn Rate
summary: RHOAI Dashboard Probe Success Burn Rate
expr: |
sum(probe_success:burnrate5m{name=~"rhods-dashboard"}) by (name) > (14.40 * (1-0.99950))
and
Expand All @@ -665,11 +665,11 @@ data:
labels:
severity: critical
namespace: redhat-ods-applications
- alert: RHODS Dashboard Probe Success Burn Rate
- alert: RHOAI Dashboard Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-dashboard-probe-success-burn-rate.md"
summary: RHODS Dashboard Probe Success Burn Rate
summary: RHOAI Dashboard Probe Success Burn Rate
expr: |
sum(probe_success:burnrate30m{name=~"rhods-dashboard"}) by (name) > (6.00 * (1-0.99950))
and
Expand All @@ -678,11 +678,11 @@ data:
labels:
severity: critical
namespace: redhat-ods-applications
- alert: RHODS Dashboard Probe Success Burn Rate
- alert: RHOAI Dashboard Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-dashboard-probe-success-burn-rate.md"
summary: RHODS Dashboard Probe Success Burn Rate
summary: RHOAI Dashboard Probe Success Burn Rate
expr: |
sum(probe_success:burnrate2h{name=~"rhods-dashboard"}) by (name) > (3.00 * (1-0.99950))
and
Expand All @@ -691,11 +691,11 @@ data:
labels:
severity: warning
namespace: redhat-ods-applications
- alert: RHODS Dashboard Probe Success Burn Rate
- alert: RHOAI Dashboard Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/RHODS-Dashboard/rhods-dashboard-probe-success-burn-rate.md"
summary: RHODS Dashboard Probe Success Burn Rate
summary: RHOAI Dashboard Probe Success Burn Rate
expr: |
sum(probe_success:burnrate6h{name=~"rhods-dashboard"}) by (name) > (1.00 * (1-0.99950))
and
Expand Down Expand Up @@ -894,7 +894,7 @@ data:
labels:
severity: warning
namespace: redhat-ods-applications
- name: RHODS Data Science Pipelines
- name: RHOAI Data Science Pipelines
rules:
- alert: Data Science Pipeline Application Unavailable
annotations:
Expand Down Expand Up @@ -1295,7 +1295,7 @@ data:
workbenches-alerting.rules: |
groups:
- name: RHODS-PVC-Usage
- name: RHOAI-PVC-Usage
rules:
- alert: User notebook pvc usage above 90%
annotations:
Expand All @@ -1318,7 +1318,7 @@ data:
severity: warning
route: user-notifications
- name: RHODS Notebook controllers
- name: RHOAI Notebook controllers
rules:
- alert: Kubeflow notebook controller pod is not running
annotations:
Expand All @@ -1343,11 +1343,11 @@ data:
- name: SLOs-probe_success_workbench
rules:
- alert: RHODS Jupyter Probe Success Burn Rate
- alert: RHOAI Jupyter Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Jupyter/rhods-jupyter-probe-success-burn-rate.md"
summary: RHODS Jupyter Probe Success Burn Rate
summary: RHOAI Jupyter Probe Success Burn Rate
expr: |
sum(probe_success:burnrate5m{instance=~"notebook-spawner"}) by (instance) > (14.40 * (1-0.98000))
and
Expand All @@ -1356,11 +1356,11 @@ data:
labels:
severity: critical
instance: notebook-spawner
- alert: RHODS Jupyter Probe Success Burn Rate
- alert: RHOAI Jupyter Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Jupyter/rhods-jupyter-probe-success-burn-rate.md"
summary: RHODS Jupyter Probe Success Burn Rate
summary: RHOAI Jupyter Probe Success Burn Rate
expr: |
sum(probe_success:burnrate30m{instance=~"notebook-spawner"}) by (instance) > (6.00 * (1-0.98000))
and
Expand All @@ -1369,11 +1369,11 @@ data:
labels:
severity: critical
instance: notebook-spawner
- alert: RHODS Jupyter Probe Success Burn Rate
- alert: RHOAI Jupyter Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Jupyter/rhods-jupyter-probe-success-burn-rate.md"
summary: RHODS Jupyter Probe Success Burn Rate
summary: RHOAI Jupyter Probe Success Burn Rate
expr: |
sum(probe_success:burnrate2h{instance=~"notebook-spawner"}) by (instance) > (3.00 * (1-0.98000))
and
Expand All @@ -1382,11 +1382,11 @@ data:
labels:
severity: warning
instance: notebook-spawner
- alert: RHODS Jupyter Probe Success Burn Rate
- alert: RHOAI Jupyter Probe Success Burn Rate
annotations:
message: 'High error budget burn for {{ $labels.instance }} (current value: {{ $value }}).'
triage: "https://gitlab.cee.redhat.com/service/managed-tenants-sops/-/blob/main/RHODS/Jupyter/rhods-jupyter-probe-success-burn-rate.md"
summary: RHODS Jupyter Probe Success Burn Rate
summary: RHOAI Jupyter Probe Success Burn Rate
expr: |
sum(probe_success:burnrate6h{instance=~"notebook-spawner"}) by (instance) > (1.00 * (1-0.98000))
and
Expand Down
2 changes: 1 addition & 1 deletion controllers/datasciencecluster/kubebuilder_rbac.go
Original file line number Diff line number Diff line change
Expand Up @@ -252,6 +252,6 @@ package datasciencecluster
// +kubebuilder:rbac:groups="maistra.io",resources=servicemeshmembers,verbs=create;get;list;patch;update;use;watch
// +kubebuilder:rbac:groups="maistra.io",resources=servicemeshmembers/finalizers,verbs=create;get;list;patch;update;use;watch

/* Only for RHODS */
/* Only for RHOAI */
// +kubebuilder:rbac:groups="user.openshift.io",resources=groups,verbs=get;create;list;watch;patch;delete
// +kubebuilder:rbac:groups="console.openshift.io",resources=consolelinks,verbs=create;get;patch;delete
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ func (r *DSCInitializationReconciler) Reconcile(ctx context.Context, req ctrl.Re
return reconcile.Result{}, err
}
if instance.Spec.Monitoring.ManagementState == operatorv1.Managed {
r.Log.Info("Monitoring enabled, won't apply changes", "cluster", "Self-Managed RHODS Mode")
r.Log.Info("Monitoring enabled, won't apply changes", "cluster", "Self-Managed RHOAI Mode")
err = r.configureCommonMonitoring(instance)
if err != nil {
return reconcile.Result{}, err
Expand Down
12 changes: 6 additions & 6 deletions pkg/deploy/setup.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import (
const (
// ManagedRhods defines expected addon catalogsource.
ManagedRhods Platform = "addon-managed-odh-catalog"
// SelfManagedRhods defines display name in csv.
SelfManagedRhods Platform = "Red Hat OpenShift Data Science"
// SelfManagedRhods defines display name in csv
SelfManagedRhods Platform = "Red Hat OpenShift AI"
// OpenDataHub defines display name in csv.
OpenDataHub Platform = "Open Data Hub Operator"
// Unknown indicates that operator is not deployed using OLM
Expand Down Expand Up @@ -46,8 +46,8 @@ func isSelfManaged(cli client.Client) (Platform, error) {
return Unknown, nil
}

// isManagedRHODS checks if CRD add-on exists and contains string ManagedRhods.
func isManagedRHODS(cli client.Client) (Platform, error) {
// isManagedRHOAI checks if CRD add-on exists and contains string ManagedRhods.
func isManagedRHOAI(cli client.Client) (Platform, error) {
catalogSourceCRD := &apiextv1.CustomResourceDefinition{}

err := cli.Get(context.TODO(), client.ObjectKey{Name: "catalogsources.operators.coreos.com"}, catalogSourceCRD)
Expand Down Expand Up @@ -79,8 +79,8 @@ func isManagedRHODS(cli client.Client) (Platform, error) {

func GetPlatform(cli client.Client) (Platform, error) {
// First check if its addon installation to return 'ManagedRhods, nil'
if platform, err := isManagedRHODS(cli); err != nil {
return Unknown, err
if platform, err := isManagedRHOAI(cli); err != nil {
return "", err
} else if platform == ManagedRhods {
return ManagedRhods, nil
}
Expand Down

0 comments on commit 1269e19

Please sign in to comment.