From 8618bcf840615c50e1bf22748894d056dd37d341 Mon Sep 17 00:00:00 2001 From: David Grove Date: Tue, 20 May 2025 13:26:36 -0400 Subject: [PATCH] refine rhoai 2.19 upgrade instructions --- setup.RHOAI-v2.19/UPGRADE-FAST.md | 27 ++++++++++++++++----------- setup.RHOAI-v2.19/UPGRADE-STABLE.md | 29 ++++++++++++++++------------- 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/setup.RHOAI-v2.19/UPGRADE-FAST.md b/setup.RHOAI-v2.19/UPGRADE-FAST.md index 52515e1..22d896c 100644 --- a/setup.RHOAI-v2.19/UPGRADE-FAST.md +++ b/setup.RHOAI-v2.19/UPGRADE-FAST.md @@ -18,19 +18,18 @@ install-kpzzl rhods-operator.2.19.0 Manual false install-nqrbp rhods-operator.2.18.0 Manual true ``` -Before approving the upgrade, you must manually remove v1alpha1 MultiKueue CRD's +Assuming the install plan exists you can begin the upgrade process. + +As part of the upgrade, you must manually remove v1alpha1 MultiKueue CRD's from your cluster. These CRDs were replaced by v1beta1 versions in the Kueue 0.9 release, but the RHOAI operator will not automatically remove CRDs. -Ensure you have no instances: + +First, ensure that you have no instances: ```sh kubectl get multikueueclusters.kueue.x-k8s.io --all-namespaces kubectl get multikueueconfigs.kueue.x-k8s.io --all-namespaces ``` -Delete all any instances. Then delete the CRDs -```sh -kubectl delete crd multikueueclusters.kueue.x-k8s.io -kubectl delete crd multikueueconfigs.kueue.x-k8s.io -``` +If you do have any instances, delete them before proceeding. Next, update the MLBatch modifications to the default RHOAI configuration maps and subscription. ```sh @@ -41,15 +40,21 @@ oc apply -f setup.RHOAI-v2.19/mlbatch-upgrade-fast-subscription.yaml oc apply -f setup.RHOAI-v2.19/mlbatch-network-policy.yaml ``` -Finally, you can approve the install plan replacing the example plan name below +Next, you can approve the install plan replacing the example plan name below with the actual value on your cluster: ```sh oc patch ip -n redhat-ods-operator --type merge --patch '{"spec":{"approved":true}}' install-kpzzl ``` -After the upgraded operator pod is running in the `redhat-ods-operator` namespace, delete the -`kueue-metrics-service` from the `redhat-ods-applications` namespace and let the operator recreate it. -This removes port `8080`, which is no longer used. +After the upgraded operator pod is running in the `redhat-ods-operator` namespace, +delete the v1alpha1 MultiKueue CRDs (this will enable the operator to proceed with updating Kueue). +```sh +kubectl delete crd multikueueclusters.kueue.x-k8s.io +kubectl delete crd multikueueconfigs.kueue.x-k8s.io +``` + +Finally, delete the `kueue-metrics-service` from the `redhat-ods-applications` namespace and +let the operator recreate it. This removes port `8080`, which is no longer used. ```sh oc delete service kueue-metrics-service -n redhat-ods-applications ``` diff --git a/setup.RHOAI-v2.19/UPGRADE-STABLE.md b/setup.RHOAI-v2.19/UPGRADE-STABLE.md index 91df26b..715819f 100644 --- a/setup.RHOAI-v2.19/UPGRADE-STABLE.md +++ b/setup.RHOAI-v2.19/UPGRADE-STABLE.md @@ -21,38 +21,41 @@ install-nqrbp rhods-operator.2.16.0 Manual true Assuming the install plan exists you can begin the upgrade process. -Before approving the upgrade, you must manually remove v1alpha1 MultiKueue CRD's +As part of the upgrade, you must manually remove v1alpha1 MultiKueue CRD's from your cluster. These CRDs were replaced by v1beta1 versions in the Kueue 0.9 release, but the RHOAI operator will not automatically remove CRDs. -Ensure you have no instances: -``` + +First, ensure that you have no instances: +```sh kubectl get multikueueclusters.kueue.x-k8s.io --all-namespaces kubectl get multikueueconfigs.kueue.x-k8s.io --all-namespaces ``` -Delete all any instances. Then delete the CRDs -``` -kubectl delete crd multikueueclusters.kueue.x-k8s.io -kubectl delete crd multikueueconfigs.kueue.x-k8s.io -``` +If you do have any instances, delete them before proceeding. Next, update the MLBatch modifications to the default RHOAI configuration maps and subscription. ```sh oc delete cm mlbatch-kuberay -n redhat-ods-operator oc delete cm mlbatch-codeflare -n redhat-ods-operator oc apply -f setup.RHOAI-v2.19/mlbatch-upgrade-configmaps.yaml -oc apply -f setup.RHOAI-v2.19/mlbatch-upgrade-stable-subscription.yaml +oc apply -f setup.RHOAI-v2.19/mlbatch-upgrade-fast-subscription.yaml oc apply -f setup.RHOAI-v2.19/mlbatch-network-policy.yaml ``` -Finally, you can approve the install plan replacing the example plan name below +Next, you can approve the install plan replacing the example plan name below with the actual value on your cluster: ```sh oc patch ip -n redhat-ods-operator --type merge --patch '{"spec":{"approved":true}}' install-kpzzl ``` -After the upgraded operator pod is running in the `redhat-ods-operator` namespace, delete the -`kueue-metrics-service` from the `redhat-ods-applications` namespace and let the operator recreate it. -This removes port `8080`, which is no longer used. +After the upgraded operator pod is running in the `redhat-ods-operator` namespace, +delete the v1alpha1 MultiKueue CRDs (this will enable the operator to proceed with updating Kueue). +```sh +kubectl delete crd multikueueclusters.kueue.x-k8s.io +kubectl delete crd multikueueconfigs.kueue.x-k8s.io +``` + +Finally, delete the `kueue-metrics-service` from the `redhat-ods-applications` namespace and +let the operator recreate it. This removes port `8080`, which is no longer used. ```sh oc delete service kueue-metrics-service -n redhat-ods-applications ```