From 2f03de341f1d8d4ed5b89ff37b8d7397c79b3cb5 Mon Sep 17 00:00:00 2001
From: gcoon151 <grcoon@us.ibm.com>
Date: Tue, 21 Jan 2025 15:18:12 -0500
Subject: [PATCH] ibmcloud: Improvements to ROKS demo instructions

1. Replaced kubectl with oc (bc Openshift)
2. Added caution about deleting cluster without deleting workload.
3. fixed version

Signed-off-by: gcoon151 <grcoon@us.ibm.com>
---
 src/cloud-api-adaptor/ibmcloud/ROKS_SETUP.md | 37 +++++++++++---------
 1 file changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/cloud-api-adaptor/ibmcloud/ROKS_SETUP.md b/src/cloud-api-adaptor/ibmcloud/ROKS_SETUP.md
index c5006f0af..6f43ab773 100644
--- a/src/cloud-api-adaptor/ibmcloud/ROKS_SETUP.md
+++ b/src/cloud-api-adaptor/ibmcloud/ROKS_SETUP.md
@@ -50,7 +50,7 @@ If you are using an existing cluster, you can skip this section and proceed to [
 1. Create a ROKS cluster
 
     ```bash
-    ibmcloud ks cluster create vpc-gen2 --flavor bx2.4x16 --name "$CLUSTER_NAME" --subnet-id "$SUBNET_ID" --vpc-id "$VPC_ID" --zone "$ZONE" --operating-system RHCOS --workers 2 --version 4.16.23_openshift --disable-outbound-traffic-protection --cos-instance "$COS_CRN"
+    ibmcloud ks cluster create vpc-gen2 --flavor bx2.4x16 --name "$CLUSTER_NAME" --subnet-id "$SUBNET_ID" --vpc-id "$VPC_ID" --zone "$ZONE" --operating-system RHCOS --workers 2 --version 4.17.12_openshift --disable-outbound-traffic-protection --cos-instance "$COS_CRN"
 
     ```
 
@@ -80,7 +80,7 @@ By default, your Red Hat OpenShift cluster will not work with the peer pod compo
 1. Allow `cloud-api-adaptor` to update pod finalizers
 
     ```bash
-    kubectl apply -n default -f - <<EOF
+    oc apply -n default -f - <<EOF
     apiVersion: rbac.authorization.k8s.io/v1
     kind: ClusterRole
     metadata:
@@ -111,7 +111,7 @@ By default, your Red Hat OpenShift cluster will not work with the peer pod compo
 1. Label worker nodes for `cloud-api-adaptor`
 
     ```bash
-    kubectl label nodes $(kubectl get nodes -o jsonpath={.items..metadata.name}) node.kubernetes.io/worker=
+    oc label nodes $(oc get nodes -o jsonpath={.items..metadata.name}) node.kubernetes.io/worker=
     ```
 
 1. Give `cc-operator` and `cloud-api-adaptor` priviledged OpenShift SCC permission
@@ -208,7 +208,7 @@ popd
 Run the following command to confirm that the operator and cloud-api-adaptor have been deployed:
 
 ```bash
-kubectl get pods -n confidential-containers-system
+oc get pods -n confidential-containers-system
 ```
 
 Once everything is up and ruuning, you should see output similar to the following:
@@ -229,8 +229,8 @@ peerpod-ctrl-controller-manager-65f76cb59-vhbt4   2/2     Running   0          5
 You can run the following commands to validate that your cluster has been set up properly and is working as expected.
 
 ```bash
-kubectl apply -n default -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/curl/curl.yaml
-kubectl apply -n default -f - <<EOF
+oc apply -n default -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/curl/curl.yaml
+oc apply -n default -f - <<EOF
 apiVersion: v1
 kind: Pod
 metadata:
@@ -251,8 +251,8 @@ EOF
 Run the following commands to verify that the pods, peer pod, and pod VM are up and running:
 
 ```bash
-kubectl get pods -n default
-kubectl get peerpod -n default
+oc get pods -n default
+oc get peerpod -n default
 ibmcloud is instances | grep podvm
 ```
 
@@ -264,9 +264,9 @@ Finally, run the following command to verify that the helloworld service, runnin
 from the curl pod:
 
 ```bash
-export CURL_POD=$(kubectl get pod -n default -l app=curl -o jsonpath={.items..metadata.name})
-export HELLO_IP=$(kubectl get pod -n default -l app=helloworld -o jsonpath={.items..status.podIP})
-kubectl exec -n default -it $CURL_POD -c curl -- curl http://$HELLO_IP:5000/hello
+export CURL_POD=$(oc get pod -n default -l app=curl -o jsonpath={.items..metadata.name})
+export HELLO_IP=$(oc get pod -n default -l app=helloworld -o jsonpath={.items..status.podIP})
+oc exec -n default -it $CURL_POD -c curl -- curl http://$HELLO_IP:5000/hello
 ```
 
 If everything is working, you will see the following output:
@@ -277,22 +277,27 @@ Hello version: v1, instance: helloworld
 
 ## Uninstall and clean up
 
-If you want to cleanup the whole demo, including the cluster, simply delete the IBM Cloud cluster. Otherwise:
+If you want to cleanup the whole demo, including the cluster, simply delete the IBM Cloud cluster. 
+
+> [!NOTE]
+> Deleting the cluster might persist the podvm created by cloud-api-adaptor. Make sure to delete the Helloworld pod first.
+
+Otherwise:
 
 1. To delete the Helloworld sample
 
     ```bash
-    kubectl delete -n default -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/curl/curl.yaml
-    kubectl delete -n default pod helloworld
+    oc delete -n default -f https://raw.githubusercontent.com/istio/istio/release-1.24/samples/curl/curl.yaml
+    oc delete -n default pod helloworld
     ```
 
-1. To uninstall the peer pod components
+1. To uninstall the peer pod components 
 
     ```bash
     pushd test/tools
     export CLOUD_PROVIDER=ibmcloud
     export TEST_PROVISION_FILE="$HOME/peerpods-cluster.properties"
     ./caa-provisioner-cli -action=uninstall
-    kubectl delete ns confidential-containers-system
+    oc delete ns confidential-containers-system
     popd
     ```