Re-factor exit handling, use nc for socat wait, registry/group vars

Signed-off-by: Michael Edgar <medgar@redhat.com>

Author: MikeEdgar

systemtests/scripts/setup-minikube.sh

@@ -2,21 +2,37 @@
 
 set -euox pipefail
 
-SOCAT_PID=""
+OLM_INSTALL_SCRIPT=$(mktemp)
+
+# Keep track of the last run command line number on error
+trap 'last_line=${LINENO}' ERR
+
+cleanup_and_exit() {
+    # Capture the exact exit code of the last executed command
+    local exit_code=${?}
 
-function handle_error {
-    echo "Error occurred at line $1"
-    if [ -n "${SOCAT_PID}" ] ; then
-        kill ${SOCAT_PID}
+    echo "🧹 Cleaning up..."
+    if [ -e ${OLM_INSTALL_SCRIPT} ] ; then
+        rm -vf ${OLM_INSTALL_SCRIPT}
     fi
-    kill 0 # kill the master shell and all subshells
+
+    if [ "${exit_code}" -ne 0 ]; then
+        echo "❌ Failed with exit code ${exit_code} at line ${last_line}"
+    fi
+
+    kill $(jobs -p) 2>/dev/null || true
+    exit "${exit_code}"
 }
 
-trap 'handle_error $LINENO' ERR
+trap cleanup_and_exit EXIT
 
-OLM_VERSION="v0.42.0"
+OLM_VERSION="v0.45.0"
 OLM_SCRIPT_SHA256="1e8065cb503d2ee94ce82dd2591618022852f53a43df908b9f8c7d314cff3532"
 
+IMAGE_REGISTRY='localhost:5000'
+IMAGE_GROUP='streamshub'
+IMAGE_PREFIX="${IMAGE_REGISTRY}/${IMAGE_GROUP}"
+
 if [ -n "${MINIKUBE_PROFILE:-}" ] ; then
     MK_PROFILE_ARG="--profile=${MINIKUBE_PROFILE}"
 else
@@ -30,7 +46,7 @@ if ! minikube status ${MK_PROFILE_ARG} >/dev/null 2>&1 ; then
     --memory=${MINIKUBE_MEMORY:-16384} \
     --container-runtime=${MINIKUBE_CONTAINER_RUNTIME:-docker} \
     --addons=registry,storage,ingress,ingress-dns,metrics-server \
-    --insecure-registry="localhost:5000,10.0.0.0/24" \
+    --insecure-registry="${IMAGE_REGISTRY},10.0.0.0/24" \
     --extra-config=kubeadm.ignore-preflight-errors=SystemVerification \
     --extra-config=apiserver.authorization-mode=RBAC,Node
 fi
@@ -44,15 +60,12 @@ if [ "$(kubectl get deployment -n ingress-nginx ingress-nginx-controller -ojson
 fi
 
 # Setup OLM -----------------------------------------------------
-OLM_INSTALL_SCRIPT=$(mktemp)
-
 curl --proto "=https" -o ${OLM_INSTALL_SCRIPT} -sL \
   https://github.com/operator-framework/operator-lifecycle-manager/releases/download/${OLM_VERSION}/install.sh
 
 echo "${OLM_SCRIPT_SHA256} ${OLM_INSTALL_SCRIPT}" | sha256sum --check --status || { echo "Hash verification failed"; exit 1; }
 chmod +x ${OLM_INSTALL_SCRIPT}
 ${OLM_INSTALL_SCRIPT} ${OLM_VERSION} || true
-rm -v ${OLM_INSTALL_SCRIPT}
 
 # Build and push Console images ---------------------------------
 PROJECT_VERSION=$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout | tr '[:upper:]' '[:lower:]')
@@ -87,8 +100,9 @@ fi
 
 mvn clean package -Pcontainer-image -B --no-transfer-progress -DskipTests \
  -Dquarkus.kubernetes.namespace='$${NAMESPACE}' \
+ -Dcontainer-image.registry="${IMAGE_REGISTRY}" \
+ -Dcontainer-image.group="${IMAGE_GROUP}" \
  -Dcontainer-image.tag=${PROJECT_VERSION} \
- -Dcontainer-image.registry='localhost:5000' \
  -Dcontainer-image.push=false
 
 ./operator/bin/modify-bundle-metadata.sh \
@@ -97,27 +111,28 @@ mvn clean package -Pcontainer-image -B --no-transfer-progress -DskipTests \
   "PLATFORMS=${PLATFORMS}"
 
 ${CONTAINER_RUNTIME} build \
- -t localhost:5000/streamshub/console-operator-bundle:${PROJECT_VERSION} \
+ -t ${IMAGE_PREFIX}/console-operator-bundle:${PROJECT_VERSION} \
  -f operator/target/bundle/streamshub-console-operator/bundle.Dockerfile \
  operator/target/bundle/streamshub-console-operator
 
 ./operator/bin/generate-catalog.sh ./operator/target/bundle/streamshub-console-operator true
 
 ${CONTAINER_RUNTIME} build \
- -t localhost:5000/streamshub/console-operator-catalog:${PROJECT_VERSION} \
+ -t ${IMAGE_PREFIX}/console-operator-catalog:${PROJECT_VERSION} \
  -f operator/src/main/docker/catalog.Dockerfile \
  operator/
 
 socat TCP-LISTEN:5000,reuseaddr,fork TCP:$(minikube ip ${MK_PROFILE_ARG}):5000 &
-SOCAT_PID=${!}
+
 # Wait for socat to warm up
-sleep 5
+for i in $(seq 1 30); do
+    nc -z localhost 5000 && break
+    sleep 1
+done
 
 for img in console-api console-operator console-operator-bundle console-operator-catalog ; do
+  # TODO: deeper evaluation of `minikube image load`
   skopeo copy --preserve-digests --dest-tls-verify=false \
-    ${SKOPEO_LOCAL}localhost:5000/streamshub/${img}:${PROJECT_VERSION} \
-    docker://localhost:5000/streamshub/${img}:${PROJECT_VERSION}
+    ${SKOPEO_LOCAL}${IMAGE_PREFIX}/${img}:${PROJECT_VERSION} \
+    docker://${IMAGE_PREFIX}/${img}:${PROJECT_VERSION}
 done
-
-kill ${SOCAT_PID}
-SOCAT_PID=""