Skip to content

Commit

Permalink
Update minimum supported base platform to OpenShift 4.14 / Kuberenete…
Browse files Browse the repository at this point in the history
…s 1.27 (#86)
  • Loading branch information
dgrove-oss authored Oct 18, 2024
1 parent c6af463 commit 8bb8dd4
Show file tree
Hide file tree
Showing 27 changed files with 35 additions and 35 deletions.
10 changes: 5 additions & 5 deletions SETUP.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ will be used in the setup process for each team of MLBatch users that
is onboarded.

This setup has been developed on OpenShift 4.14 and Kubernetes 1.27 and
is intended to support OpenShift 4.12 and up and/or Kubernetes 1.25 and up.
is intended to support OpenShift 4.14 and up and/or Kubernetes 1.27 and up.

To start with, recursively clone and enter this repository:
```sh
Expand Down Expand Up @@ -50,11 +50,11 @@ Instructions are provided for the following OpenShift AI ***fast*** releases:

## Kubernetes

MLBatch can be installed on any Kubernetes cluster version 1.25 or later
MLBatch can be installed on any Kubernetes cluster version 1.27 or later
by following these instructions:
+ [Kubernetes Cluster Setup](./setup.k8s-v1.25/CLUSTER-SETUP.md)
+ [Kubternets Team Setup](./setup.k8s-v1.25/TEAM-SETUP.md)
+ [Kubernetes Uninstall](setup.k8s-v1.25/UNINSTALL.md)
+ [Kubernetes Cluster Setup](./setup.k8s-v1.27/CLUSTER-SETUP.md)
+ [Kubternets Team Setup](./setup.k8s-v1.27/TEAM-SETUP.md)
+ [Kubernetes Uninstall](setup.k8s-v1.27/UNINSTALL.md)

On Kubernetes version 1.30 and later, an enhanced user experience is
available by using ValidatingAdmissionPolicies to streamline quota
Expand Down
13 changes: 0 additions & 13 deletions setup.k8s-v1.25/kind/kind-config.yaml

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ kubectl delete crd noderesourcetopologies.topology.node.k8s.io

Create `default-priority`, `high-priority`, and `low-priority` priority classes:
```sh
kubectl apply -f setup.k8s-v1.25/mlbatch-priorities.yaml
kubectl apply -f setup.k8s-v1.27/mlbatch-priorities.yaml
```

## Coscheduler
Expand All @@ -40,8 +40,8 @@ helm install scheduler-plugins --namespace scheduler-plugins --create-namespace
```
Patch Coscheduler pod priorities:
```sh
kubectl patch deployment -n scheduler-plugins --type=json --patch-file setup.k8s-v1.25/coscheduler-priority-patch.yaml scheduler-plugins-controller
kubectl patch deployment -n scheduler-plugins --type=json --patch-file setup.k8s-v1.25/coscheduler-priority-patch.yaml scheduler-plugins-scheduler
kubectl patch deployment -n scheduler-plugins --type=json --patch-file setup.k8s-v1.27/coscheduler-priority-patch.yaml scheduler-plugins-controller
kubectl patch deployment -n scheduler-plugins --type=json --patch-file setup.k8s-v1.27/coscheduler-priority-patch.yaml scheduler-plugins-scheduler
```

## Install Operators
Expand All @@ -53,22 +53,22 @@ kubectl create namespace mlbatch-system

Install the Kubeflow Training Operator
```sh
kubectl apply --server-side -k setup.k8s-v1.25/training-operator
kubectl apply --server-side -k setup.k8s-v1.27/training-operator
```

Install the KubeRay Operator
```sh
kubectl apply --server-side -k setup.k8s-v1.25/kuberay
kubectl apply --server-side -k setup.k8s-v1.27/kuberay
```

Install Kueue
```sh
kubectl apply --server-side -k setup.k8s-v1.25/kueue
kubectl apply --server-side -k setup.k8s-v1.27/kueue
```

Install the AppWrapper Operator
```sh
kubectl apply --server-side -k setup.k8s-v1.25/appwrapper
kubectl apply --server-side -k setup.k8s-v1.27/appwrapper
```
The provided configuration differs from the default configuration of the
operators as follows:
Expand All @@ -90,14 +90,14 @@ operators as follows:

Create Kueue's default flavor:
```sh
kubectl apply -f setup.k8s-v1.25/default-flavor.yaml
kubectl apply -f setup.k8s-v1.27/default-flavor.yaml
```

## Cluster Role

Create `mlbatch-edit` role:
```sh
kubectl apply -f setup.k8s-v1.25/mlbatch-edit-role.yaml
kubectl apply -f setup.k8s-v1.27/mlbatch-edit-role.yaml
```

## Slack Cluster Queue
Expand Down
File renamed without changes.
8 changes: 4 additions & 4 deletions setup.k8s-v1.25/UNINSTALL.md → setup.k8s-v1.27/UNINSTALL.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ Then to uninstall the MLBatch controllers and reclaim the corresponding
namespaces, do the following:
```sh
# Delete operators and CRDs
kubectl delete -k setup.k8s-v1.25/appwrapper
kubectl delete -k setup.k8s-v1.25/kueue
kubectl delete -k setup.k8s-v1.25/kuberay
kubectl delete -k setup.k8s-v1.25/training-operator
kubectl delete -k setup.k8s-v1.27/appwrapper
kubectl delete -k setup.k8s-v1.27/kueue
kubectl delete -k setup.k8s-v1.27/kuberay
kubectl delete -k setup.k8s-v1.27/training-operator

# Delete namespace
kubectl delete namespace mlbatch-system
Expand Down
File renamed without changes.
13 changes: 13 additions & 0 deletions setup.k8s-v1.27/kind/kind-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
# this config file contains all config fields with comments
kind: Cluster
apiVersion: kind.x-k8s.io/v1alpha4
# 1 control plane node and 1 worker node
nodes:
# the control plane node config
- role: control-plane
# kubernetes version 1.27.17 from kind v0.24.0
image: kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe
# the worker
- role: worker
# kubernetes version 1.27.17 from kind v0.24.0
image: kindest/node:v1.27.17@sha256:3fd82731af34efe19cd54ea5c25e882985bafa2c9baefe14f8deab1737d9fabe
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Values for Kubernetes v1.25+
# Values for Kubernetes v1.27+

OPENSHIFT: false
VERSION: k8s-v1.25
VERSION: k8s-v1.27
KUBECTL: kubectl
VAP: false
SLACKCQ: true
4 changes: 2 additions & 2 deletions setup.tmpl/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ docs: gotmpl
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.RHOAI-v2.12/TEAM-SETUP.md -values RHOAI-v2.12.yaml
../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.RHOAI-v2.13/CLUSTER-SETUP.md -values RHOAI-v2.13.yaml
../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.k8s-v1.25/CLUSTER-SETUP.md -values Kubernetes-v1.25.yaml
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.k8s-v1.25/TEAM-SETUP.md -values Kubernetes-v1.25.yaml
../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.k8s-v1.27/CLUSTER-SETUP.md -values Kubernetes-v1.27.yaml
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.k8s-v1.27/TEAM-SETUP.md -values Kubernetes-v1.27.yaml
../tools/gotmpl/gotmpl -input ./CLUSTER-SETUP.md.tmpl -output ../setup.k8s-v1.30/CLUSTER-SETUP.md -values Kubernetes-v1.30.yaml
../tools/gotmpl/gotmpl -input ./TEAM-SETUP.md.tmpl -output ../setup.k8s-v1.30/TEAM-SETUP.md -values Kubernetes-v1.30.yaml

Expand Down

0 comments on commit 8bb8dd4

Please sign in to comment.