node-installer: allow overriding image name via env var

Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>

Author: Mossaka

node-installer/integration-test-k3s.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+# Default image name that can be overridden via environment variables
+: ${IMAGE_NAME:=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev}
+
 echo "Installing K3s..."
 curl -sfL https://get.k3s.io | INSTALL_K3S_EXEC="--disable=traefik --write-kubeconfig-mode=644" sh -
 
@@ -17,7 +20,7 @@ kubectl create namespace kwasm || true
 kubectl apply -f ../deployments/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
-if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:dev >/dev/null 2>&1; then
+if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
   PLATFORM=$(uname -m)
   if [ "$PLATFORM" = "x86_64" ]; then
@@ -31,11 +34,11 @@ if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:d
     exit 1
   fi
 
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev make build-dev-installer-image
+  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into K3s..."
-docker save ghcr.io/spinkube/containerd-shim-spin/node-installer:dev > node-installer.tar
+docker save $IMAGE_NAME > node-installer.tar
 sudo k3s ctr images import node-installer.tar
 rm node-installer.tar
 

node-installer/integration-test-kind.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+# Default image name that can be overridden via environment variables
+: ${IMAGE_NAME:=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev}
+
 echo "=== Step 1: Create a kind cluster ==="
 if kind get clusters | grep -q "spin-test"; then
   echo "Deleting existing cluster..."
@@ -16,7 +19,7 @@ kubectl --context=kind-spin-test create namespace kwasm || true
 kubectl --context=kind-spin-test apply -f ../deployments/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
-if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:v0.18.0 >/dev/null 2>&1; then
+if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
   PLATFORM=$(uname -m)
   if [ "$PLATFORM" = "x86_64" ]; then
@@ -30,11 +33,11 @@ if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:v
     exit 1
   fi
 
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev make build-dev-installer-image
+  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into kind..."
-kind load docker-image ghcr.io/spinkube/containerd-shim-spin/node-installer:dev --name spin-test
+kind load docker-image $IMAGE_NAME --name spin-test
 
 echo "Applying KWasm node installer job..."
 kubectl --context=kind-spin-test apply -f ./kwasm-job.yml

node-installer/integration-test-microk8s.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+# Default image name that can be overridden via environment variables
+: ${IMAGE_NAME:=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev}
+
 echo "=== Step 1: Setup MicroK8s ==="
 if ! command -v microk8s >/dev/null 2>&1; then
   echo "MicroK8s is not installed. Please install it first."
@@ -25,7 +28,7 @@ kubectl create namespace kwasm || true
 kubectl apply -f ../deployments/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
-if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:dev >/dev/null 2>&1; then
+if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
   PLATFORM=$(uname -m)
   if [ "$PLATFORM" = "x86_64" ]; then
@@ -39,11 +42,11 @@ if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:d
     exit 1
   fi
 
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev make build-dev-installer-image
+  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into MicroK8s..."
-docker save ghcr.io/spinkube/containerd-shim-spin/node-installer:dev > node-installer.tar
+docker save $IMAGE_NAME > node-installer.tar
 sudo microk8s ctr image import node-installer.tar
 rm node-installer.tar
 

node-installer/integration-test-minikube.sh

@@ -1,6 +1,9 @@
 #!/bin/bash
 set -euo pipefail
 
+# Default image name that can be overridden via environment variables
+: ${IMAGE_NAME:=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev}
+
 echo "=== Step 1: Create a MiniKube cluster ==="
 minikube start -p minikube --driver=docker --container-runtime=containerd
 
@@ -9,7 +12,7 @@ kubectl create namespace kwasm || true
 kubectl apply -f ../deployments/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
-if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:dev >/dev/null 2>&1; then
+if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
   echo "Building node installer image..."
   PLATFORM=$(uname -m)
   if [ "$PLATFORM" = "x86_64" ]; then
@@ -23,11 +26,11 @@ if ! docker image inspect ghcr.io/spinkube/containerd-shim-spin/node-installer:d
     exit 1
   fi
 
-  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=ghcr.io/spinkube/containerd-shim-spin/node-installer:dev make build-dev-installer-image
+  PLATFORM=$PLATFORM ARCH=$ARCH IMAGE_NAME=$IMAGE_NAME make build-dev-installer-image
 fi
 
 echo "Loading node installer image into MiniKube..."
-minikube image load ghcr.io/spinkube/containerd-shim-spin/node-installer:dev -p minikube
+minikube image load $IMAGE_NAME -p minikube
 
 NODE_NAME=$(kubectl get nodes --context=minikube -o jsonpath='{.items[0].metadata.name}')
 cp kwasm-job.yml minikube-kwasm-job.yml