From 6b4ff49b26f15595680e09191919c2bc825a8a5b Mon Sep 17 00:00:00 2001
From: David Grove <groved@us.ibm.com>
Date: Wed, 19 Mar 2025 16:44:16 -0400
Subject: [PATCH] Fast stream update: replace 2.17 with 2.18
---
SETUP.md | 10 +++++-----
.../CLUSTER-SETUP.md | 16 ++++++++--------
.../TEAM-SETUP.md | 0
.../UNINSTALL.md | 0
.../UPGRADE.md | 14 +++++++-------
.../default-flavor.yaml | 0
.../mlbatch-dsc.yaml | 0
.../mlbatch-dsci.yaml | 0
.../mlbatch-edit-role.yaml | 0
.../mlbatch-priorities.yaml | 0
.../mlbatch-subscription.yaml | 2 +-
.../scheduler-priority-patch.yaml | 0
setup.tmpl/Makefile | 4 ++--
setup.tmpl/RHOAI-v2.18.yaml | 6 ++++++
14 files changed, 29 insertions(+), 23 deletions(-)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/CLUSTER-SETUP.md (92%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/TEAM-SETUP.md (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/UNINSTALL.md (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/UPGRADE.md (67%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/default-flavor.yaml (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/mlbatch-dsc.yaml (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/mlbatch-dsci.yaml (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/mlbatch-edit-role.yaml (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/mlbatch-priorities.yaml (100%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/mlbatch-subscription.yaml (99%)
rename {setup.RHOAI-v2.17 => setup.RHOAI-v2.18}/scheduler-priority-patch.yaml (100%)
create mode 100644 setup.tmpl/RHOAI-v2.18.yaml
diff --git a/SETUP.md b/SETUP.md
index db4ec25..0127133 100644
--- a/SETUP.md
+++ b/SETUP.md
@@ -45,11 +45,11 @@ Instructions are provided for the following Red Hat OpenShift AI ***stable*** re
+ [RHOAI 2.13 Uninstall](./setup.RHOAI-v2.13/UNINSTALL.md)
Instructions are provided for the following Red Hat OpenShift AI ***fast*** releases:
-+ Red Hat OpenShift AI 2.17
- + [RHOAI 2.17 Cluster Setup](./setup.RHOAI-v2.17/CLUSTER-SETUP.md)
- + [RHOAI 2.17 Team Setup](./setup.RHOAI-v2.17/TEAM-SETUP.md)
- + [UPGRADING from RHOAI 2.16](./setup.RHOAI-v2.17/UPGRADE.md)
- + [RHOAI 2.17 Uninstall](./setup.RHOAI-v2.17/UNINSTALL.md)
++ Red Hat OpenShift AI 2.18
+ + [RHOAI 2.18 Cluster Setup](./setup.RHOAI-v2.18/CLUSTER-SETUP.md)
+ + [RHOAI 2.18 Team Setup](./setup.RHOAI-v2.18/TEAM-SETUP.md)
+ + [UPGRADING from RHOAI 2.16](./setup.RHOAI-v2.18/UPGRADE.md)
+ + [RHOAI 2.18 Uninstall](./setup.RHOAI-v2.18/UNINSTALL.md)
## Kubernetes
diff --git a/setup.RHOAI-v2.17/CLUSTER-SETUP.md b/setup.RHOAI-v2.18/CLUSTER-SETUP.md
similarity index 92%
rename from setup.RHOAI-v2.17/CLUSTER-SETUP.md
rename to setup.RHOAI-v2.18/CLUSTER-SETUP.md
index b63416d..63d642e 100644
--- a/setup.RHOAI-v2.17/CLUSTER-SETUP.md
+++ b/setup.RHOAI-v2.18/CLUSTER-SETUP.md
@@ -7,7 +7,7 @@ cluster roles, and priority classes.
Create `default-priority`, `high-priority`, and `low-priority` priority classes:
```sh
-oc apply -f setup.RHOAI-v2.17/mlbatch-priorities.yaml
+oc apply -f setup.RHOAI-v2.18/mlbatch-priorities.yaml
```
## Scheduler Configuration
@@ -28,8 +28,8 @@ helm install scheduler-plugins --namespace scheduler-plugins --create-namespace
```
Patch scheduler-plugins pod priorities:
```sh
-oc patch deployment -n scheduler-plugins --type=json --patch-file setup.RHOAI-v2.17/scheduler-priority-patch.yaml scheduler-plugins-controller
-oc patch deployment -n scheduler-plugins --type=json --patch-file setup.RHOAI-v2.17/scheduler-priority-patch.yaml scheduler-plugins-scheduler
+oc patch deployment -n scheduler-plugins --type=json --patch-file setup.RHOAI-v2.18/scheduler-priority-patch.yaml scheduler-plugins-controller
+oc patch deployment -n scheduler-plugins --type=json --patch-file setup.RHOAI-v2.18/scheduler-priority-patch.yaml scheduler-plugins-scheduler
```
@@ -38,7 +38,7 @@ oc patch deployment -n scheduler-plugins --type=json --patch-file setup.RHOAI-v2
Create the Red Hat OpenShift AI subscription:
```sh
-oc apply -f setup.RHOAI-v2.17/mlbatch-subscription.yaml
+oc apply -f setup.RHOAI-v2.18/mlbatch-subscription.yaml
````
Identify install plan:
```sh
@@ -55,11 +55,11 @@ oc patch ip -n redhat-ods-operator --type merge --patch '{"spec":{"approved":tru
```
Create DSC Initialization:
```sh
-oc apply -f setup.RHOAI-v2.17/mlbatch-dsci.yaml
+oc apply -f setup.RHOAI-v2.18/mlbatch-dsci.yaml
```
Create Data Science Cluster:
```sh
-oc apply -f setup.RHOAI-v2.17/mlbatch-dsc.yaml
+oc apply -f setup.RHOAI-v2.18/mlbatch-dsc.yaml
```
The provided DSCI and DSC are intended to install a minimal set of Red Hat OpenShift
AI managed components: `codeflare`, `kueue`, `ray`, and `trainingoperator`. The
@@ -117,14 +117,14 @@ The `ServiceMonitor` labeling is not required.
Create Kueue's default flavor:
```sh
-oc apply -f setup.RHOAI-v2.17/default-flavor.yaml
+oc apply -f setup.RHOAI-v2.18/default-flavor.yaml
```
## Cluster Role
Create `mlbatch-edit` role:
```sh
-oc apply -f setup.RHOAI-v2.17/mlbatch-edit-role.yaml
+oc apply -f setup.RHOAI-v2.18/mlbatch-edit-role.yaml
```
## Slack Cluster Queue
diff --git a/setup.RHOAI-v2.17/TEAM-SETUP.md b/setup.RHOAI-v2.18/TEAM-SETUP.md
similarity index 100%
rename from setup.RHOAI-v2.17/TEAM-SETUP.md
rename to setup.RHOAI-v2.18/TEAM-SETUP.md
diff --git a/setup.RHOAI-v2.17/UNINSTALL.md b/setup.RHOAI-v2.18/UNINSTALL.md
similarity index 100%
rename from setup.RHOAI-v2.17/UNINSTALL.md
rename to setup.RHOAI-v2.18/UNINSTALL.md
diff --git a/setup.RHOAI-v2.17/UPGRADE.md b/setup.RHOAI-v2.18/UPGRADE.md
similarity index 67%
rename from setup.RHOAI-v2.17/UPGRADE.md
rename to setup.RHOAI-v2.18/UPGRADE.md
index c16b6a2..3d21d22 100644
--- a/setup.RHOAI-v2.17/UPGRADE.md
+++ b/setup.RHOAI-v2.18/UPGRADE.md
@@ -1,12 +1,12 @@
-# Upgrading from RHOAI 2.16
+# Upgrading from RHOAI 2.17
-These instructions assume you installed and configured RHOAI 2.16 following
-the MLBatch [install instructions for RHOAI-v2.16](../setup.RHOAI-v2.16/CLUSTER-SETUP.md)
-or the [fast stream upgrade instructions for RHOAI-V2.16](../setup.RHOAI-v2.16/UPGRADE-FAST.md)
+These instructions assume you installed and configured RHOAI 2.17 following
+the MLBatch [install instructions for RHOAI-v2.17](../setup.RHOAI-v2.17/CLUSTER-SETUP.md)
+or the [fast stream upgrade instructions for RHOAI-V2.17](../setup.RHOAI-v2.17/UPGRADE.md)
and are subscribed to the fast channel.
Your subscription will have automatically created an unapproved
-install plan to upgrade to RHOAI 2.17.
+install plan to upgrade to RHOAI 2.18.
Before beginning, verify that the expected install plan exists:
```sh
@@ -15,8 +15,8 @@ oc get ip -n redhat-ods-operator
Typical output would be:
```sh
NAME CSV APPROVAL APPROVED
-install-kpzzl rhods-operator.2.17.0 Manual false
-install-nqrbp rhods-operator.2.16.0 Manual true
+install-kpzzl rhods-operator.2.18.0 Manual false
+install-nqrbp rhods-operator.2.17.0 Manual true
```
Assuming the install plan exists you can begin the upgrade process.
diff --git a/setup.RHOAI-v2.17/default-flavor.yaml b/setup.RHOAI-v2.18/default-flavor.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/default-flavor.yaml
rename to setup.RHOAI-v2.18/default-flavor.yaml
diff --git a/setup.RHOAI-v2.17/mlbatch-dsc.yaml b/setup.RHOAI-v2.18/mlbatch-dsc.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/mlbatch-dsc.yaml
rename to setup.RHOAI-v2.18/mlbatch-dsc.yaml
diff --git a/setup.RHOAI-v2.17/mlbatch-dsci.yaml b/setup.RHOAI-v2.18/mlbatch-dsci.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/mlbatch-dsci.yaml
rename to setup.RHOAI-v2.18/mlbatch-dsci.yaml
diff --git a/setup.RHOAI-v2.17/mlbatch-edit-role.yaml b/setup.RHOAI-v2.18/mlbatch-edit-role.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/mlbatch-edit-role.yaml
rename to setup.RHOAI-v2.18/mlbatch-edit-role.yaml
diff --git a/setup.RHOAI-v2.17/mlbatch-priorities.yaml b/setup.RHOAI-v2.18/mlbatch-priorities.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/mlbatch-priorities.yaml
rename to setup.RHOAI-v2.18/mlbatch-priorities.yaml
diff --git a/setup.RHOAI-v2.17/mlbatch-subscription.yaml b/setup.RHOAI-v2.18/mlbatch-subscription.yaml
similarity index 99%
rename from setup.RHOAI-v2.17/mlbatch-subscription.yaml
rename to setup.RHOAI-v2.18/mlbatch-subscription.yaml
index 71b0c63..836653e 100644
--- a/setup.RHOAI-v2.17/mlbatch-subscription.yaml
+++ b/setup.RHOAI-v2.18/mlbatch-subscription.yaml
@@ -275,7 +275,7 @@ spec:
name: rhods-operator
source: redhat-operators
sourceNamespace: openshift-marketplace
- startingCSV: rhods-operator.2.17.0
+ startingCSV: rhods-operator.2.18.0
config:
env:
- name: "DISABLE_DSC_CONFIG"
diff --git a/setup.RHOAI-v2.17/scheduler-priority-patch.yaml b/setup.RHOAI-v2.18/scheduler-priority-patch.yaml
similarity index 100%
rename from setup.RHOAI-v2.17/scheduler-priority-patch.yaml
rename to setup.RHOAI-v2.18/scheduler-priority-patch.yaml
diff --git a/setup.tmpl/Makefile b/setup.tmpl/Makefile
index e6b9781..08f5639 100644
--- a/setup.tmpl/Makefile
+++ b/setup.tmpl/Makefile
@@ -25,8 +25,8 @@ docs: gotmpl
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.RHOAI-v2.13/TEAM-SETUP.md -values RHOAI-v2.13.yaml
../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.RHOAI-v2.16/CLUSTER-SETUP.md -values RHOAI-v2.16.yaml
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.RHOAI-v2.16/TEAM-SETUP.md -values RHOAI-v2.16.yaml
- ../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.RHOAI-v2.17/CLUSTER-SETUP.md -values RHOAI-v2.17.yaml
- ../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.RHOAI-v2.17/TEAM-SETUP.md -values RHOAI-v2.17.yaml
+ ../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.RHOAI-v2.18/CLUSTER-SETUP.md -values RHOAI-v2.18.yaml
+ ../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.RHOAI-v2.18/TEAM-SETUP.md -values RHOAI-v2.18.yaml
../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.k8s/CLUSTER-SETUP.md -values Kubernetes.yaml
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.k8s/TEAM-SETUP.md -values Kubernetes.yaml
diff --git a/setup.tmpl/RHOAI-v2.18.yaml b/setup.tmpl/RHOAI-v2.18.yaml
new file mode 100644
index 0000000..d0c7fef
--- /dev/null
+++ b/setup.tmpl/RHOAI-v2.18.yaml
@@ -0,0 +1,6 @@
+# Values for RHOAI 2.18
+
+RHOAI: true
+VERSION: RHOAI-v2.18
+KUBECTL: oc
+FAIRSHARE: true