resources now go in default namespace, and edited unique id shortcut

Author: mvinci12

Container-Root/ray/deploy/fsx/dynamic-create.sh

@@ -64,18 +64,16 @@ echo "SECURITYGROUP_ID: "
 echo $SECURITYGROUP_ID
 
 
-echo "In kuberay namespace..."
 
 echo "Applying dynamic-storageclass.yaml"
-# kubectl apply -f dynamic-storageclass.yaml -n kuberay
-envsubst < /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-storageclass.yaml | kubectl apply -n kuberay  -f -
+envsubst < /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-storageclass.yaml | kubectl apply  -f -
 
 
 echo "Applying dynamic-pvc.yaml"
-kubectl apply -f /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-pvc.yaml -n kuberay
+kubectl apply -f /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-pvc.yaml
 
 echo "Describing pvc fsx-claim"
-kubectl describe pvc fsx-claim -n kuberay
+kubectl describe pvc fsx-claim 
 
 
 

Container-Root/ray/deploy/fsx/dynamic-delete.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-echo "In kuberay namespace..."
 
 echo "Deleting dynamic-pvc.yaml"
-kubectl delete -f /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-pvc.yaml -n kuberay
+kubectl delete -f /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-pvc.yaml
 
 echo "Deleting dynamic-storageclass.yaml"
-# kubectl apply -f dynamic-storageclass.yaml -n kuberay
-envsubst < /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-storageclass.yaml | kubectl delete -n kuberay  -f -
+
+envsubst < /aws-do-ray/Container-Root/ray/deploy/fsx/dynamic-storageclass.yaml | kubectl delete  -f -
 
 echo "Describing pvc fsx-claim"
-kubectl describe pvc fsx-claim -n kuberay
+kubectl describe pvc fsx-claim

Container-Root/ray/deploy/fsx/static-create.sh

@@ -1,18 +1,17 @@
 #!/bin/bash
-echo "In kuberay namespace..."
 
 echo "Applying static-storageclass.yaml"
-# kubectl apply -f static-storageclass.yaml -n kuberay
-envsubst < static-storageclass.yaml | kubectl apply -n kuberay  -f -
+
+envsubst < static-storageclass.yaml | kubectl apply  -f -
 
 
 echo "Applying static-pv.yaml"
-# kubectl apply -f static-pv.yaml -n kuberay
-envsubst < static-pv.yaml | kubectl apply -n kuberay  -f -
+
+envsubst < static-pv.yaml | kubectl apply  -f -
 
 
 echo "Applying static-pvc.yaml"
-kubectl apply -f static-pvc.yaml -n kuberay
+kubectl apply -f static-pvc.yaml
 
 echo "Describing pvc fsx-claim"
-kubectl describe pvc fsx-claim -n kuberay
+kubectl describe pvc fsx-claim

Container-Root/ray/deploy/fsx/static-delete.sh

@@ -1,18 +1,16 @@
 #!/bin/bash
-echo "In kuberay namespace..."
 
 echo "Deleting static-storageclass.yaml"
-# kubectl apply -f static-storageclass.yaml -n kuberay
-envsubst < static-storageclass.yaml | kubectl delete -n kuberay  -f -
+
+envsubst < static-storageclass.yaml | kubectl delete  -f -
 
 
 echo "Deleting static-pv.yaml"
-# kubectl apply -f static-pv.yaml -n kuberay
-envsubst < static-pv.yaml | kubectl delete -n kuberay  -f -
+envsubst < static-pv.yaml | kubectl delete  -f -
 
 
 echo "Deleting static-pvc.yaml"
-kubectl delete -f static-pvc.yaml -n kuberay
+kubectl delete -f static-pvc.yaml
 
 echo "Describing pvc fsx-claim"
-kubectl describe pvc fsx-claim -n kuberay
+kubectl describe pvc fsx-claim

Container-Root/ray/deploy/s3-mountpoint/s3-create.sh

@@ -1,12 +1,11 @@
 #!/bin/bash
-echo "In kuberay namespace..."
 
 echo "Applying pv-s3.yaml"
-# kubectl apply -f pv-s3.yaml -n kuberay
-envsubst < pv-s3.yaml | kubectl apply -n kuberay -f -
+
+envsubst < pv-s3.yaml | kubectl apply -f -
 
 echo "Applying pvc-s3.yaml"
-kubectl apply -f pvc-s3.yaml -n kuberay
+kubectl apply -f pvc-s3.yaml
 
 echo "Describing pvc s3-claim"
-kubectl describe pvc s3-claim -n kuberay
+kubectl describe pvc s3-claim

Container-Root/ray/ops/ray-expose.sh

@@ -6,9 +6,9 @@ if [ "$?" == 0 ]; then
 else
 	PID_FILE="$HOME/port-forward.pid"
 	# kubectl port-forward --address 0.0.0.0 service/raycluster-kuberay-head-svc 8265:8265 > /dev/null 2>&1 &
-	export SERVICEHEAD=$(kubectl get service -n kuberay | grep head-svc | awk '{print $1}' | head -n 1)
+	export SERVICEHEAD=$(kubectl get service | grep head-svc | awk '{print $1}' | head -n 1)
 
-	kubectl port-forward --address 0.0.0.0 service/${SERVICEHEAD} -n kuberay 8265:8265 > /dev/null 2>&1 &
+	kubectl port-forward --address 0.0.0.0 service/${SERVICEHEAD} 8265:8265 > /dev/null 2>&1 &
 	echo $! > "$PID_FILE"
 	echo "Port-forward started, PID $! saved in $PID_FILE"
 	sleep 1

Container-Root/ray/raycluster/jobs/job-list.sh

@@ -9,6 +9,8 @@ CMD="ray job list --address http://localhost:8265 | sed -n \"s/.*submission_id='
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 
+echo ""
+
 #echo -e "\nTo get the status of a job, please run './job-status.sh <submission_id>' where <submission_id> is listed for your jobs above."
 #echo -e "\nTo get the logs of a job, please run './job-logs.sh <submission_id>' where <submission_id> is listed for your jobs above."
 #echo -e "\nTo stop a job, please run './job-stop.sh <submission_id>' where <submission_id> is listed for your jobs above.\n"

Container-Root/ray/raycluster/jobs/job-logs.sh

@@ -16,7 +16,8 @@ if [ -z "$1" ]; then
 fi
 
 # Assign the user's input to a variable
-submission_id=$1
+submission_id=$(ray job list --address http://localhost:8265 | sed -n "s/.*submission_id='\([^']*\)'.*entrypoint='\([^']*\)'.*/submission_id: \1, entrypoint: \2/p" | grep $1 | head -n 1 | cut -d ' ' -f 2 | cut -d ',' -f 1)
+# submission_id=$1
 
 CMD="ray job logs --address http://localhost:8265 $submission_id"
 

Container-Root/ray/raycluster/jobs/job-status.sh

@@ -15,7 +15,8 @@ if [ -z "$1" ]; then
 fi
 
 # Assign the user's input to a variable
-submission_id=$1
+submission_id=$(ray job list --address http://localhost:8265 | sed -n "s/.*submission_id='\([^']*\)'.*entrypoint='\([^']*\)'.*/submission_id: \1, entrypoint: \2/p" | grep $1 | head -n 1 | cut -d ' ' -f 2 | cut -d ',' -f 1)
+# submission_id=$1
 
 CMD="ray job status --address http://localhost:8265 $submission_id"
 

Container-Root/ray/raycluster/jobs/job-stop.sh

@@ -7,13 +7,16 @@ if [ -z "$1" ]; then
     echo "Error: No submission_id provided."
     echo "Usage: ./job-status.sh <submission_id>"
     echo "List of jobs to choose from:"
+    echo ""
     ray job list --address http://localhost:8265 | sed -n "s/.*submission_id='\([^']*\)'.*entrypoint='\([^']*\)'.*/submission_id: \1, entrypoint: \2/p"
     echo -e "\n"
     exit 1
 fi
 
 # Assign the user's input to a variable
-submission_id=$1
+submission_id=$(ray job list --address http://localhost:8265 | sed -n "s/.*submission_id='\([^']*\)'.*entrypoint='\([^']*\)'.*/submission_id: \1, entrypoint: \2/p" | grep $1 | head -n 1 | cut -d ' ' -f 2 | cut -d ',' -f 1)
+
+# submission_id=$1
 
 CMD="ray job stop --address http://localhost:8265 $submission_id"
 

Container-Root/ray/raycluster/jobs/job-submit.sh

@@ -25,7 +25,7 @@ submit_via_head() {
     local working_dir="$script_name"
 
     # Get the name of the head pod
-    head_pod=$(kubectl get pods -n kuberay --selector=ray.io/node-type=head -o custom-columns=POD:metadata.name --no-headers)
+    head_pod=$(kubectl get pods --selector=ray.io/node-type=head -o custom-columns=POD:metadata.name --no-headers)
 
     # Check if the head pod is found
     if [ -z "$head_pod" ]; then
@@ -35,14 +35,14 @@ submit_via_head() {
 
     # Copy the script to the head pod
     if [ -d "$working_dir" ]; then
-        kubectl cp "$working_dir/$script_name.py" "$head_pod:/tmp/$script_name.py" -n kuberay
+        kubectl cp "$working_dir/$script_name.py" "$head_pod:/tmp/$script_name.py"
     else
         echo "Error: Working directory '$working_dir' does not exist."
         exit 1
     fi
 
     # Run the Python script on the head pod
-    CMD="kubectl exec -it "$head_pod" -n kuberay -- python \"/tmp/$script_name.py\""
+    CMD="kubectl exec -it "$head_pod" -- python \"/tmp/$script_name.py\""
     if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
     eval "$CMD"
 }
@@ -53,7 +53,7 @@ submit_local_job() {
     local script_name="$1"
     local script_path="$2"
 
-    head_pod=$(kubectl get pods -n kuberay --selector=ray.io/node-type=head -o custom-columns=POD:metadata.name --no-headers)
+    head_pod=$(kubectl get pods --selector=ray.io/node-type=head -o custom-columns=POD:metadata.name --no-headers)
 
     # Check if the head pod is found
     if [ -z "$head_pod" ]; then
@@ -62,11 +62,11 @@ submit_local_job() {
     fi
 
     # Check if the file exists inside the pod
-    file_exists=$(kubectl exec "$head_pod" -n kuberay -- bash -c "[ -f $script_path/$script_name.py ] && echo 'true' || echo 'false'")
+    file_exists=$(kubectl exec "$head_pod" -- bash -c "[ -f $script_path/$script_name.py ] && echo 'true' || echo 'false'")
 
     if [ "$file_exists" == "true" ]; then
         # submit_via_head "$script_name"
-        CMD="kubectl exec -it \"$head_pod\" -n kuberay -- python \"$script_path/$script_name.py\""
+        CMD="kubectl exec -it \"$head_pod\" -- python \"$script_path/$script_name.py\""
 	if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 	eval "$CMD"
     else
@@ -77,7 +77,9 @@ submit_local_job() {
 
 # Check if a script name or path has been provided
 if [ "$#" -eq 0 ]; then
-    echo "Usage: $0 <script-name> [script-path]"
+    echo ""
+    echo "Usage: $0 <script-name> optional:[script-path]"
+    echo ""
     exit 1
 fi
 

Container-Root/ray/raycluster/raycluster-config.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CMD="kubectl get pods --namespace kuberay"
+CMD="kubectl get pods"
 
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"

Container-Root/ray/raycluster/raycluster-create.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CMD="kubectl get raycluster --namespace kuberay"
+CMD="kubectl get raycluster"
 
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"

Container-Root/ray/raycluster/raycluster-delete.sh

@@ -2,7 +2,6 @@ apiVersion: ray.io/v1
 kind: RayCluster
 metadata:
   name: raycluster-autoscaler
-  namespace: kuberay
   labels:
     controller-tools.k8s.io: "1.0"
 spec:

Container-Root/ray/raycluster/raycluster-pods.sh

@@ -2,7 +2,6 @@ apiVersion: ray.io/v1alpha1
 kind: RayCluster
 metadata:
   name: rayml
-  namespace: kuberay
   labels:
     controller-tools.k8s.io: "1.0"
 spec:

Container-Root/ray/raycluster/raycluster-status.sh

@@ -25,7 +25,7 @@ JOB=$(echo "$JOB" | tr '[:upper:]' '[:lower:]')
 #     exit 2
 # fi
 
-CMD="kubectl apply -f ${JOB}/ray-job.${JOB}.yaml -n kuberay"
+CMD="kubectl apply -f ${JOB}/ray-job.${JOB}.yaml"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 

Container-Root/ray/raycluster/raycluster-template-autoscaler.yaml

@@ -14,12 +14,13 @@ if [ -z "$1" ]; then
 fi
 
 # Set the model name from the argument
-JOB=$1
+# JOB=$1
+JOB=$(kubectl get rayjob | grep $1 | head -n 1 | cut -d ' ' -f 1)
 
 # Convert the model name to lowercase for consistency
 JOB=$(echo "$JOB" | tr '[:upper:]' '[:lower:]')
 
-CMD="kubectl delete rayjob $JOB -n kuberay"
+CMD="kubectl delete rayjob $JOB"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 

Container-Root/ray/raycluster/raycluster-template.yaml

@@ -14,8 +14,10 @@ if [ -z "$1" ]; then
 fi
 
 # Assign the user's input to a variable
-JOB=$1
+# JOB=$1
+JOB=$(kubectl get rayjob | grep $1 | head -n 1 | cut -d ' ' -f 1)
 
-CMD="kubectl logs -l=job-name=$JOB -n kuberay"
+
+CMD="kubectl logs -l=job-name=$JOB"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"

Container-Root/ray/rayjob/rayjob-create.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CMD="kubectl get pods --namespace kuberay"
+CMD="kubectl get pods"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 

Container-Root/ray/rayjob/rayjob-delete.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CMD="kubectl get rayjob --namespace kuberay"
+CMD="kubectl get rayjob"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 

Container-Root/ray/rayjob/rayjob-logs.sh

@@ -18,7 +18,7 @@ MODEL_NAME=$1
 MODEL_NAME=$(echo "$MODEL_NAME" | tr '[:upper:]' '[:lower:]')
 
 
-CMD="kubectl apply -f ${MODEL_NAME}/ray-service.${MODEL_NAME}.yaml -n kuberay"
+CMD="kubectl apply -f ${MODEL_NAME}/ray-service.${MODEL_NAME}.yaml"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 
@@ -45,12 +45,12 @@ echo "Waiting for query service... this service is created after the Ray Serve a
 SVC_CNT=0
 while [ "$SVC_CNT" == "0" ]; do 
 	sleep 2
-	SVC_CNT=$(kubectl -n kuberay get svc | grep ${MODEL_NAME}-serve-svc | wc -l)
+	SVC_CNT=$(kubectl get svc | grep ${MODEL_NAME}-serve-svc | wc -l)
 done
 echo ""
 echo "Forwarding the port for Stable Diffusion Query"
 echo ""
-kubectl port-forward svc/${MODEL_NAME}-serve-svc -n kuberay 8000 > /dev/null 2>&1 &
+kubectl port-forward svc/${MODEL_NAME}-serve-svc 8000 > /dev/null 2>&1 &
 
 if [ $? -eq 0 ]; then
     echo "Query is ready..."
@@ -62,10 +62,10 @@ if [ $? -eq 0 ]; then
 else
     echo "Failed to port forward query..."
     echo ""
-    echo "Issue may be service "svc/${MODEL_NAME}-serve-svc" is not ready... please run 'kubectl get svc -n kuberay' to double check."
-    echo "If it becomes ready, please run 'kubectl port-forward svc/stable-diffusion-serve-svc -n kuberay 8000'"
+    echo "Issue may be service "svc/${MODEL_NAME}-serve-svc" is not ready... please run 'kubectl get svc' to double check."
+    echo "If it becomes ready, please run 'kubectl port-forward svc/stable-diffusion-serve-svc 8000'"
     echo ""
 fi
 
-echo "Run './rayservice-status.sh' to view the serve status."
-echo "Run 'kubectl get pods -n kuberay' to view cluster pods."
+echo "Run './rayservice-status.sh' or ' to view the serve status."
+echo "Run 'kubectl get pods' or 'kgp' to view cluster pods."

Container-Root/ray/rayjob/rayjob-pods.sh

@@ -19,7 +19,7 @@ MODEL_NAME=$1
 # Convert the model name to lowercase for consistency
 MODEL_NAME=$(echo "$MODEL_NAME" | tr '[:upper:]' '[:lower:]')
 
-CMD="kubectl delete rayservice $MODEL_NAME -n kuberay"
+CMD="kubectl delete rayservice $MODEL_NAME"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 
@@ -34,7 +34,7 @@ fi
 if [ $? -eq 0 ]; then
     echo "Service deleted successfully for model: $MODEL_NAME."
     echo "Run './rayservice-status.sh' to view the serve status."
-    echo "Run 'kgp -n kuberay' to view cluster pods."
+    echo "Run 'kgp' to view cluster pods."
     echo ""
 else
     echo "Error deleting RayService for model: $MODEL_NAME"

Container-Root/ray/rayjob/rayjob-status.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 
-CMD="kubectl get pods -n kuberay"
+CMD="kubectl get pods"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"
 

Container-Root/ray/rayservice/rayservice-create.sh

@@ -1,5 +1,5 @@
 #!/bin/bash
 
-CMD="kubectl get rayservice -n kuberay"
+CMD="kubectl get rayservice"
 if [ ! "$VERBOSE" == "false" ]; then echo -e "\n${CMD}\n"; fi
 eval "$CMD"

Container-Root/ray/rayservice/rayservice-delete.sh

@@ -35,4 +35,4 @@ echo "Deploying FSX Dependences..."
 echo "Dynamically Provisioning FSX For Lustre Cluster... this may take a few minutes"
 ./deploy/fsx/dynamic-create.sh
 
-echo "Please wait until FSx Cluster is up and ready until you deploy Ray Cluster. Please check AWS Console, or run fsx-list.sh, or use alias fl, or run 'kubectl get pvc -n kuberay' and wait until status is 'Bound'"
+echo "Please wait until FSx Cluster is up and ready until you deploy Ray Cluster. Please check AWS Console, or run fsx-list.sh, or use alias fl, or run 'kubectl get pvc' and wait until status is 'Bound'"