update: functions

redhat-na-ssa · Jun 25, 2024 · 5fcce0e · 5fcce0e
1 parent e51e8c3
commit 5fcce0e
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 12 deletions.
diff --git a/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh b/components/operators/gpu-operator-certified/instance/components/aws-gpu-machineset/ocp.sh
@@ -1,6 +1,19 @@
 #!/bin/bash
 # shellcheck disable=SC2120
 
+# See https://github.com/redhat-na-ssa/demo-ai-gitops-catalog
+# FUNCTIONS='
+# ocp_aws_cluster
+# ocp_aws_create_gpu_machineset
+# ocp_aws_clone_worker_machineset
+# ocp_create_machineset_autoscale'
+
+# for function in $FUNCTIONS
+# do
+#   extract_function $function scripts/library/ocp.sh >> tmp
+#   echo >> tmp
+# done
+
 ocp_aws_cluster(){
   TARGET_NS=kube-system
   OBJ=secret/aws-creds
@@ -22,7 +35,7 @@ ocp_aws_create_gpu_machineset(){
 
   INSTANCE_TYPE=${1:-g4dn.4xlarge}
 
-  ocp_aws_clone_machineset "${INSTANCE_TYPE}"
+  ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}"
 
   MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1)
 
@@ -57,28 +70,38 @@ ocp_aws_create_gpu_machineset(){
     --type=merge --patch '{"spec":{"template":{"spec":{"providerSpec":{"value":{"instanceType":"'"${INSTANCE_TYPE}"'"}}}}}}'
 }
 
-ocp_aws_clone_machineset(){
+ocp_aws_clone_worker_machineset(){
   [ -z "${1}" ] && \
   echo "
-    usage: ocp_aws_create_gpu_machineset < instance type, default g4dn.4xlarge >
+    usage: ocp_aws_clone_worker_machineset < instance type, default g4dn.4xlarge > < machine set name >
   "
 
   INSTANCE_TYPE=${1:-g4dn.4xlarge}
-  MACHINE_SET=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1)
+  SHORT_NAME=${2:-${INSTANCE_TYPE%.*}}
+
+  MACHINE_SET_NAME=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${SHORT_NAME}" | head -n1)
+  MACHINE_SET_WORKER=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep worker | head -n1)
 
   # check for an existing instance machine set
-  if oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep -q "${INSTANCE_TYPE%.*}"; then
-    echo "Exists: machineset - ${INSTANCE_TYPE}"
+  if [ -n "${MACHINE_SET_NAME}" ]; then
+    echo "Exists: machineset - ${MACHINE_SET_NAME}"
   else
-    echo "Creating: machineset - ${INSTANCE_TYPE}"
+    echo "Creating: machineset - ${SHORT_NAME}"
     oc -n openshift-machine-api \
-      get "${MACHINE_SET}" -o yaml | \
+      get "${MACHINE_SET_WORKER}" -o yaml | \
         sed '/machine/ s/-worker/-'"${INSTANCE_TYPE}"'/g
-          /name/ s/-worker/-'"${INSTANCE_TYPE%.*}"'/g
+          /^  name:/ s/cluster-.*/'"${SHORT_NAME}"'/g
+          /name/ s/-worker/-'"${SHORT_NAME}"'/g
           s/instanceType.*/instanceType: '"${INSTANCE_TYPE}"'/
+          /cluster-api-autoscaler/d
           s/replicas.*/replicas: 0/' | \
       oc apply -f -
   fi
+
+  # cosmetic pretty
+  oc -n openshift-machine-api \
+    patch "${MACHINE_SET_NAME}" \
+    --type=merge --patch '{"spec":{"template":{"spec":{"metadata":{"labels":{"node-role.kubernetes.io/'"${SHORT_NAME}"'":""}}}}}}'
 }
 
 ocp_create_machineset_autoscale(){

diff --git a/scripts/library/common.sh b/scripts/library/common.sh
@@ -36,7 +36,7 @@ until_true(){
   echo "[OK]"
 }
 
-export_function(){
+extract_function(){
   EXPORT_NAME=${1:-ocp_aws_cluster}
   FILE=${2:-scripts/library/ocp.sh}
 

diff --git a/scripts/library/ocp.sh b/scripts/library/ocp.sh
@@ -201,7 +201,7 @@ ocp_aws_create_metal_machineset(){
 
   INSTANCE_TYPE=${1:-m5n.metal}
 
-  ocp_aws_clone_machineset "${INSTANCE_TYPE}"
+  ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}"
 
   MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1)
 
@@ -230,7 +230,7 @@ ocp_aws_create_gpu_machineset(){
 
   INSTANCE_TYPE=${1:-g4dn.4xlarge}
 
-  ocp_aws_clone_machineset "${INSTANCE_TYPE}"
+  ocp_aws_clone_worker_machineset "${INSTANCE_TYPE}"
 
   MACHINE_SET_TYPE=$(oc -n openshift-machine-api get machinesets.machine.openshift.io -o name | grep "${INSTANCE_TYPE%.*}" | head -n1)