From be1948cdfde4cfcb35a23aca9613062c82f0ab51 Mon Sep 17 00:00:00 2001
From: GROEZING <groezing@de.ibm.com>
Date: Fri, 8 Aug 2025 12:40:12 +0200
Subject: [PATCH 1/2] add the limit to run the script only on valid regions

---
 .../serverless-fleets/init-fleet-sandbox      | 28 +++++++++++++++++--
 1 file changed, 25 insertions(+), 3 deletions(-)

diff --git a/experimental/serverless-fleets/init-fleet-sandbox b/experimental/serverless-fleets/init-fleet-sandbox
index 9a192a20a..c97fed836 100755
--- a/experimental/serverless-fleets/init-fleet-sandbox
+++ b/experimental/serverless-fleets/init-fleet-sandbox
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+#### Global vars 
+# vsi_images hashmap contains the list of valid vsi-images that can be used within fleets
+# The fleet sandbox can be setup on regions with a valid vsi-image, only. 
+declare -A vsi_images
+vsi_images["eu-de"]=r010-e7b25759-7857-455a-aec0-904b65c3c4cb 
+vsi_images["eu-gb"]=r018-31655c46-96e7-4d38-b61a-2ab1b66b9bbd 
+vsi_images["us-east"]=r014-b7f47448-72db-4012-b018-bb120518b078
+
 # Env vars
 CLEANUP_ON_ERROR=${CLEANUP_ON_ERROR:=false}
 CLEANUP_ON_SUCCESS=${CLEANUP_ON_SUCCESS:=false}
@@ -32,6 +40,13 @@ sysdig_key_name="${NAME_PREFIX}--sysdig-key"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source ${SCRIPT_DIR}/common.sh
 
+
+
+
+
+
+
+
 # Clean up previous run
 function clean() {
     (
@@ -146,6 +161,14 @@ echo "Please note: This script will install various IBM Cloud resources within t
 print_msg "\nChecking prerequisites ..."
 check_prerequisites
 
+# checking if a there is a valid vsi-image in the region available  
+vsi_image_id=${vsi_images[${REGION}]}
+
+if [[ $vsi_image_id == "" || $vsi_image_id == null ]]; then 
+   echo " Fleet sandbox setup is currently not supported in region ($region), exiting setup... "
+   exit -1
+fi
+
 # Ensure that latest versions of used IBM Cloud ClI is installed
 print_msg "\nPulling latest IBM Cloud CLI release ..."
 ibmcloud update --force
@@ -409,8 +432,7 @@ ibmcloud ce secret create --name fleet-registry-secret --format registry --serve
 
 # using the common base VSI image "jwe-ubuntu24-gpu" enabled for GPU and including podman and s3fs 
 print_msg "\nCreating a Code Engine configmap 'fleet-vpc-config' to access the new VPC ..."
-# retrieve the best fitting ubuntu vsi base image by selection from available image list 
-vsi-image-id=$(ibmcloud is images --output JSON|jq -r 'first( .[]|select(.name | startswith("ibm-ubuntu-24")) ) | .id')
+
 print_msg "\nSelected the ubuntu-24 vsi image for fleets with the image-id = $vsi-image-id"
 ibmcloud ce configmap create --name fleet-vpc-config \
 --from-literal NETWORK_ZONE="${REGION}-1" \
@@ -418,7 +440,7 @@ ibmcloud ce configmap create --name fleet-vpc-config \
 --from-literal VPC_ID="$(ibmcloud is vpc ${vpc_name} --output json | jq -r '.id')" \
 --from-literal SUBNET_ID="$(ibmcloud is subnet ${vpc_name}-subnet --output json | jq -r '.id')" \
 --from-literal SECURITY_GROUP_ID="$(ibmcloud is security-group ${vpc_name}-group --output json | jq -r '.id')" \
---from-literal VSI_IMAGE_ID="$vsi-image-id" \
+--from-literal VSI_IMAGE_ID="$vsi_image_id" \
 --from-literal VSI_PREFERRED_PROFILE="cx2-2x4"
 
 # alternative to fetch the latest stock image:

From 6c2a705c720a04b6e14ad43746254ed638636ead Mon Sep 17 00:00:00 2001
From: GROEZING <groezing@de.ibm.com>
Date: Fri, 8 Aug 2025 12:44:35 +0200
Subject: [PATCH 2/2] remove block of blanks

---
 experimental/serverless-fleets/init-fleet-sandbox | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/experimental/serverless-fleets/init-fleet-sandbox b/experimental/serverless-fleets/init-fleet-sandbox
index c97fed836..c56dbe726 100755
--- a/experimental/serverless-fleets/init-fleet-sandbox
+++ b/experimental/serverless-fleets/init-fleet-sandbox
@@ -40,13 +40,6 @@ sysdig_key_name="${NAME_PREFIX}--sysdig-key"
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source ${SCRIPT_DIR}/common.sh
 
-
-
-
-
-
-
-
 # Clean up previous run
 function clean() {
     (