Updates from testing

GoogleCloudPlatform · Nov 4, 2024 · 894ab1d · 894ab1d
1 parent 291a8a9
commit 894ab1d
Show file tree

Hide file tree

Showing 11 changed files with 110 additions and 130 deletions.
diff --git a/best-practices/gke-batch-refarch/README.md b/best-practices/gke-batch-refarch/README.md
diff --git a/best-practices/gke-batch-refarch/compact_placement/create_workloads.sh b/best-practices/gke-batch-refarch/compact_placement/create_workloads.sh
@@ -18,13 +18,12 @@ echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Jobs with compact placement
-for job_id in 0 1 2 3; do
-  for team in team-a team-b team-c team-d; do
-    envsubst '$REGION, $PROJECT_ID' < ./workloads/${team}/${team}-compact-job-${job_id}.yaml | kubectl apply -f - && \
-    sleep 0.5
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+  # Jobs with compact placement
+  for job_id in 0 1 2 3; do
+    for team in team-a team-b team-c team-d; do
+      envsubst '$REGION, $PROJECT_ID' <./workloads/${team}/${team}-compact-job-${job_id}.yaml | kubectl apply -f - &&
+        sleep 0.5
+    done
+    sleep 1
   done
-  sleep 1
-done
diff --git a/best-practices/gke-batch-refarch/compact_placement/delete_workloads.sh b/best-practices/gke-batch-refarch/compact_placement/delete_workloads.sh
@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Delete compact placement Jobs
-kubectl delete -f workloads/ --recursive
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+    # Delete compact placement Jobs
+    kubectl delete -f workloads/ --recursive
diff --git a/best-practices/gke-batch-refarch/dws/create_workloads.sh b/best-practices/gke-batch-refarch/dws/create_workloads.sh
@@ -18,13 +18,12 @@ echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# DWS Jobs
-for job_id in 0; do
-  for team in team-a team-b; do
-    envsubst '$REGION, $PROJECT_ID' < ./workloads/${team}/${team}-dws-job-${job_id}.yaml | kubectl apply -f - && \
-    sleep 0.5
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+  # DWS Jobs
+  for job_id in 0; do
+    for team in team-a team-b; do
+      envsubst '$REGION, $PROJECT_ID' <./workloads/${team}/${team}-dws-job-${job_id}.yaml | kubectl apply -f - &&
+        sleep 0.5
+    done
+    sleep 1
   done
-  sleep 1
-done
diff --git a/best-practices/gke-batch-refarch/dws/delete_workloads.sh b/best-practices/gke-batch-refarch/dws/delete_workloads.sh
@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Delete high priority Jobs
-kubectl delete -f workloads/ --recursive
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+    # Delete high priority Jobs
+    kubectl delete -f workloads/ --recursive
diff --git a/best-practices/gke-batch-refarch/high_priority/create_workloads.sh b/best-practices/gke-batch-refarch/high_priority/create_workloads.sh
@@ -18,13 +18,12 @@ echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# High priority Jobs
-for job_id in 0 1 2 3; do
-  for team in team-a team-b team-c team-d; do
-    envsubst '$REGION, $PROJECT_ID' < ./workloads/${team}/${team}-high-priority-job-${job_id}.yaml | kubectl apply -f - && \
-    sleep 0.5
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+  # High priority Jobs
+  for job_id in 0 1 2 3; do
+    for team in team-a team-b team-c team-d; do
+      envsubst '$REGION, $PROJECT_ID' <./workloads/${team}/${team}-high-priority-job-${job_id}.yaml | kubectl apply -f - &&
+        sleep 0.5
+    done
+    sleep 1
   done
-  sleep 1
-done
diff --git a/best-practices/gke-batch-refarch/high_priority/delete_workloads.sh b/best-practices/gke-batch-refarch/high_priority/delete_workloads.sh
@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Delete high priority Jobs
-kubectl delete -f workloads/ --recursive
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+    # Delete high priority Jobs
+    kubectl delete -f workloads/ --recursive
diff --git a/best-practices/gke-batch-refarch/jobset/create_workloads.sh b/best-practices/gke-batch-refarch/jobset/create_workloads.sh
@@ -18,13 +18,12 @@ echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# JobSets
-for job_id in 0 1 2 3; do
-  for team in team-a team-b team-c team-d; do
-    envsubst '$REGION, $PROJECT_ID' < ./workloads/${team}/${team}-jobset-${job_id}.yaml | kubectl apply -f - && \
-    sleep 0.5
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+  # JobSets
+  for job_id in 0 1 2 3; do
+    for team in team-a team-b team-c team-d; do
+      envsubst '$REGION, $PROJECT_ID' <./workloads/${team}/${team}-jobset-${job_id}.yaml | kubectl apply -f - &&
+        sleep 0.5
+    done
+    sleep 1
   done
-  sleep 1
-done
diff --git a/best-practices/gke-batch-refarch/jobset/delete_workloads.sh b/best-practices/gke-batch-refarch/jobset/delete_workloads.sh
@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Delete JobSets
-kubectl delete -f workloads/ --recursive
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+    # Delete JobSets
+    kubectl delete -f workloads/ --recursive
diff --git a/best-practices/gke-batch-refarch/low_priority/create_workloads.sh b/best-practices/gke-batch-refarch/low_priority/create_workloads.sh
@@ -12,20 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} && \
-
-# Low priority Jobs
-for job_id in 0 1 2 3; do
-  for team in team-a team-b team-c team-d; do
-    envsubst '$REGION, $PROJECT_ID' < ./workloads/${team}/${team}-low-priority-job-${job_id}.yaml | kubectl apply -f - && \
-    sleep 0.5
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+  # Low priority Jobs
+  for job_id in 0 1 2 3; do
+    for team in team-a team-b team-c team-d; do
+      envsubst '$REGION, $PROJECT_ID' <./workloads/${team}/${team}-low-priority-job-${job_id}.yaml | kubectl apply -f - &&
+        sleep 0.5
+    done
+    sleep 1
   done
-  sleep 1
-done
diff --git a/best-practices/gke-batch-refarch/low_priority/delete_workloads.sh b/best-practices/gke-batch-refarch/low_priority/delete_workloads.sh
@@ -12,14 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-
 [[ ! "${PROJECT_ID}" ]] && echo -e "Please export PROJECT_ID variable (\e[95mexport PROJECT_ID=<YOUR POROJECT ID>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mPROJECT_ID is set to ${PROJECT_ID}\e[0m"
 
 [[ ! "${REGION}" ]] && echo -e "Please export REGION variable (\e[95mexport REGION=<YOUR REGION, eg: us-central1>\e[0m)\nExiting." && exit 0
 echo -e "\e[95mREGION is set to ${REGION}\e[0m"
 
-gcloud container clusters get-credentials gke-batch-refarch --region ${REGION} --project ${PROJECT_ID} && \
-
-# Delete low priority Jobs
-kubectl delete -f workloads/ --recursive
+gcloud container clusters get-credentials batch-dev --region ${REGION} --project ${PROJECT_ID} &&
+    # Delete low priority Jobs
+    kubectl delete -f workloads/ --recursive