From 78bda5b8d6d13c3e99fd721095d918bec3536c6e Mon Sep 17 00:00:00 2001 From: David Grove Date: Mon, 17 Mar 2025 14:47:51 -0400 Subject: [PATCH] Rename template variable from OPENSHIFT to RHOAI --- setup.tmpl/CLUSTER-SETUP.md.tmpl | 10 +++++----- setup.tmpl/Kubernetes.yaml | 2 +- setup.tmpl/RHOAI-v2.13.yaml | 2 +- setup.tmpl/RHOAI-v2.16.yaml | 2 +- setup.tmpl/RHOAI-v2.17.yaml | 2 +- setup.tmpl/TEAM-SETUP.md.tmpl | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/setup.tmpl/CLUSTER-SETUP.md.tmpl b/setup.tmpl/CLUSTER-SETUP.md.tmpl index bdfc4b9..b933ba3 100644 --- a/setup.tmpl/CLUSTER-SETUP.md.tmpl +++ b/setup.tmpl/CLUSTER-SETUP.md.tmpl @@ -1,6 +1,6 @@ # Cluster Setup -{{ if .OPENSHIFT -}} +{{ if .RHOAI -}} The cluster setup installs Red Hat OpenShift AI and Coscheduler, configures Kueue, cluster roles, and priority classes. @@ -27,7 +27,7 @@ Create `default-priority`, `high-priority`, and `low-priority` priority classes: MLBatch utilizes Kubernetes Scheduler Plugins to ensure gang scheduling of multi-Pod workloads and to pack `Pods` onto `Nodes` to reduce GPU fragmentation. -{{ if not .OPENSHIFT -}} +{{ if not .RHOAI -}} Two options are described below: Coscheduler and Sakkara. You should pick and install one of them as a secondary scheduler for your cluster. {{- end }} @@ -45,7 +45,7 @@ Patch Coscheduler pod priorities: {{ .KUBECTL }} patch deployment -n scheduler-plugins --type=json --patch-file setup.{{ .VERSION }}/coscheduler-priority-patch.yaml scheduler-plugins-scheduler ``` -{{ if not .OPENSHIFT -}} +{{ if not .RHOAI -}} ### Sakkara [Sakkara](https://github.com/atantawi/scheduler-plugins/tree/sakkara) is an experimental @@ -58,7 +58,7 @@ helm install sakkara-scheduler --namespace sakkara-scheduler --create-namespace Optionally, create a config map capturing your cluster's topology as described in the [Sakkara documentation](https://github.com/atantawi/sakkara-deploy/tree/main?tab=readme-ov-file#cluster-topology). This step is optional but recommended for production clusters. If the config map is not present Sakkara will default to a single-level hierarchy containing the Nodes of the cluster. {{- end }} -{{ if .OPENSHIFT -}} +{{ if .RHOAI -}} ## Red Hat OpenShift AI Create the Red Hat OpenShift AI subscription: @@ -207,7 +207,7 @@ helm upgrade autopilot autopilot/autopilot --install --namespace=autopilot --cre ### Enabling Prometheus metrics -{{ if .OPENSHIFT -}} +{{ if .RHOAI -}} After completing the installation, manually label the namespace to enable metrics to be scraped by Prometheus with the following command: ```bash diff --git a/setup.tmpl/Kubernetes.yaml b/setup.tmpl/Kubernetes.yaml index 51f007c..d498bdb 100644 --- a/setup.tmpl/Kubernetes.yaml +++ b/setup.tmpl/Kubernetes.yaml @@ -1,6 +1,6 @@ # Values for Kubernetes v1.29+ -OPENSHIFT: false +RHOAI: false VERSION: k8s KUBECTL: kubectl FAIRSHARE: true diff --git a/setup.tmpl/RHOAI-v2.13.yaml b/setup.tmpl/RHOAI-v2.13.yaml index b6c16e8..5fe5cfc 100644 --- a/setup.tmpl/RHOAI-v2.13.yaml +++ b/setup.tmpl/RHOAI-v2.13.yaml @@ -1,6 +1,6 @@ # Values for RHOAI 2.13 -OPENSHIFT: true +RHOAI: true VERSION: RHOAI-v2.13 KUBECTL: oc FAIRSHARE: false diff --git a/setup.tmpl/RHOAI-v2.16.yaml b/setup.tmpl/RHOAI-v2.16.yaml index 16f6472..17cff67 100644 --- a/setup.tmpl/RHOAI-v2.16.yaml +++ b/setup.tmpl/RHOAI-v2.16.yaml @@ -1,6 +1,6 @@ # Values for RHOAI 2.16 -OPENSHIFT: true +RHOAI: true VERSION: RHOAI-v2.16 KUBECTL: oc FAIRSHARE: true diff --git a/setup.tmpl/RHOAI-v2.17.yaml b/setup.tmpl/RHOAI-v2.17.yaml index 3bbe2b7..c243c3c 100644 --- a/setup.tmpl/RHOAI-v2.17.yaml +++ b/setup.tmpl/RHOAI-v2.17.yaml @@ -1,6 +1,6 @@ # Values for RHOAI 2.17 -OPENSHIFT: true +RHOAI: true VERSION: RHOAI-v2.17 KUBECTL: oc FAIRSHARE: true diff --git a/setup.tmpl/TEAM-SETUP.md.tmpl b/setup.tmpl/TEAM-SETUP.md.tmpl index 327e200..59476b0 100644 --- a/setup.tmpl/TEAM-SETUP.md.tmpl +++ b/setup.tmpl/TEAM-SETUP.md.tmpl @@ -5,7 +5,7 @@ A *team* in MLBatch is a group of users that share a resource quota. Before setting up your teams and quotas, please read [QUOTA_MAINTENANCE.md](../QUOTA_MAINTENANCE.md) for a discussion of our recommended best practices. -{{ if .OPENSHIFT }} +{{ if .RHOAI }} Setting up a new team requires the cluster admin to create a project, a user group, a quota, a queue, and the required role bindings as described below. @@ -29,7 +29,7 @@ Bind cluster role to group in namespace: Setting up a new team requires the cluster admin to create a namespace, a quota, a queue, and the required role bindings as described below. -{{ if .OPENSHIFT }} +{{ if .RHOAI }} Create the namespace: ```sh {{ .KUBECTL }} create namespace team1