node-installer: move things around

- move the testing scripts to the `node-installer/tests/` directory
- move the kwasm-job.yml to the `node-installer/tests/workloads/` directory
- symlink the workload.yaml and runtime.yaml from the root `deployments/workloads/` to the `node-installer/tests/workloads/` directory

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

Author: Mossaka

node-installer/Makefile

@@ -20,15 +20,15 @@ build-dev-installer-image: $(BINARY)
 	docker buildx build -t $(IMAGE_NAME) --load --platform $(PLATFORM) .
 
 test-kind:
-	./integration-test-kind.sh
+	./tests/integration-test-kind.sh
 
 test-minikube:
-	./integration-test-minikube.sh
+	./tests/integration-test-minikube.sh
 
 test-microk8s:
-	./integration-test-microk8s.sh
+	./tests/integration-test-microk8s.sh
 
 test-k3s:
-	./integration-test-k3s.sh
+	./tests/integration-test-k3s.sh
 
 test-all: test-kind test-minikube test-microk8s test-k3s

node-installer/README.md

@@ -10,7 +10,7 @@ project to handle this concern in the future.
 
 ## Integration Tests
 
-The project includes integration test scripts for different Kubernetes distributions:
+The project includes integration test scripts for different Kubernetes distributions in the `tests/` directory:
 
 1. Kind: `make test-kind`
 2. MiniKube: `make test-minikube`

node-installer/k3s-kwasm-job.yml

@@ -0,0 +1,27 @@
+apiVersion: v1
+kind: Pod
+metadata:
+  labels:
+    job-name: k3s-provision-kwasm
+  name: k3s-provision-kwasm-dev
+  namespace: kwasm
+spec:
+  containers:
+  - env:
+    - name: NODE_ROOT
+      value: /mnt/node-root
+    image: ghcr.io/spinkube/containerd-shim-spin/node-installer:dev
+    imagePullPolicy: IfNotPresent
+    name: kwasm-provision
+    securityContext:
+      privileged: true
+    volumeMounts:
+    - mountPath: /mnt/node-root
+      name: root-mount
+  hostPID: true
+  nodeName: devbox-5
+  restartPolicy: Never
+  volumes:
+  - hostPath:
+      path: /
+    name: root-mount

node-installer/integration-test-k3s.sh renamed to node-installer/tests/integration-test-k3s.sh

@@ -16,7 +16,7 @@ done
 
 echo "=== Step 2: Create namespace and deploy RuntimeClass ==="
 kubectl create namespace kwasm || true
-kubectl apply -f ../deployments/workloads/runtime.yaml
+kubectl apply -f ./tests/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
@@ -42,7 +42,7 @@ sudo k3s ctr images import node-installer.tar
 rm node-installer.tar
 
 NODE_NAME=$(kubectl get nodes -o jsonpath='{.items[0].metadata.name}')
-cp kwasm-job.yml k3s-kwasm-job.yml
+cp ./tests/workloads/kwasm-job.yml k3s-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm/k3s-provision-kwasm/g" k3s-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm-dev/k3s-provision-kwasm-dev/g" k3s-kwasm-job.yml
 sed -i "s/spin-test-control-plane/${NODE_NAME}/g" k3s-kwasm-job.yml
@@ -62,7 +62,7 @@ fi
 
 echo "=== Step 4: Apply the workload ==="
 sudo k3s ctr images pull ghcr.io/spinkube/containerd-shim-spin/examples/spin-rust-hello:v0.18.0
-kubectl apply -f ../deployments/workloads/workload.yaml
+kubectl apply -f ./tests/workloads/workload.yaml
 
 echo "Waiting for deployment to be ready..."
 kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s

node-installer/integration-test-kind.sh renamed to node-installer/tests/integration-test-kind.sh

@@ -25,7 +25,7 @@ kubectl --context=kind-spin-test wait --for=condition=Ready nodes --all --timeou
 
 echo "=== Step 2: Create namespace and deploy RuntimeClass ==="
 kubectl --context=kind-spin-test create namespace kwasm || true
-kubectl --context=kind-spin-test apply -f ../deployments/workloads/runtime.yaml
+kubectl --context=kind-spin-test apply -f ./tests/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
@@ -49,7 +49,7 @@ echo "Loading node installer image into kind..."
 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
+kubectl --context=kind-spin-test apply -f ./tests/workloads/kwasm-job.yml
 
 echo "Waiting for node installer job to complete..."
 kubectl --context=kind-spin-test wait -n kwasm --for=condition=Ready pod --selector=job-name=spin-test-control-plane-provision-kwasm --timeout=90s || true
@@ -62,7 +62,7 @@ if ! kubectl --context=kind-spin-test get pods -n kwasm | grep -q "spin-test-con
 fi
 
 echo "=== Step 4: Apply the workload ==="
-kubectl --context=kind-spin-test apply -f ../deployments/workloads/workload.yaml
+kubectl --context=kind-spin-test apply -f ./tests/workloads/workload.yaml
 
 echo "Waiting for deployment to be ready..."
 kubectl --context=kind-spin-test wait --for=condition=Available deployment/wasm-spin --timeout=120s

node-installer/integration-test-microk8s.sh renamed to node-installer/tests/integration-test-microk8s.sh

@@ -24,7 +24,7 @@ alias kubectl='sudo microk8s kubectl'
 
 echo "=== Step 2: Create namespace and deploy RuntimeClass ==="
 kubectl create namespace kwasm || true
-kubectl apply -f ../deployments/workloads/runtime.yaml
+kubectl apply -f ./tests/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
@@ -50,7 +50,7 @@ sudo microk8s ctr image import node-installer.tar
 rm node-installer.tar
 
 NODE_NAME=$(kubectl get nodes -o jsonpath='{.items[0].metadata.name}')
-cp kwasm-job.yml microk8s-kwasm-job.yml
+cp ./tests/workloads/kwasm-job.yml microk8s-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm/microk8s-provision-kwasm/g" microk8s-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm-dev/microk8s-provision-kwasm-dev/g" microk8s-kwasm-job.yml
 sed -i "s/spin-test-control-plane/${NODE_NAME}/g" microk8s-kwasm-job.yml
@@ -69,7 +69,7 @@ if ! kubectl get pods -n kwasm | grep -q "microk8s-provision-kwasm.*Completed";
 fi
 
 echo "=== Step 4: Apply the workload ==="
-kubectl apply -f ../deployments/workloads/workload.yaml
+kubectl apply -f ./tests/workloads/workload.yaml
 
 echo "Waiting for deployment to be ready..."
 kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s

node-installer/integration-test-minikube.sh renamed to node-installer/tests/integration-test-minikube.sh

@@ -8,7 +8,7 @@ minikube start -p minikube --driver=docker --container-runtime=containerd
 
 echo "=== Step 2: Create namespace and deploy RuntimeClass ==="
 kubectl create namespace kwasm || true
-kubectl apply -f ../deployments/workloads/runtime.yaml
+kubectl apply -f ./tests/workloads/runtime.yaml
 
 echo "=== Step 3: Build and deploy the KWasm node installer ==="
 if ! docker image inspect $IMAGE_NAME >/dev/null 2>&1; then
@@ -32,7 +32,7 @@ echo "Loading node installer image into 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
+cp ./tests/workloads/kwasm-job.yml minikube-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm/minikube-provision-kwasm/g" minikube-kwasm-job.yml
 sed -i "s/spin-test-control-plane-provision-kwasm-dev/minikube-provision-kwasm-dev/g" minikube-kwasm-job.yml
 sed -i "s/spin-test-control-plane/${NODE_NAME}/g" minikube-kwasm-job.yml
@@ -51,7 +51,7 @@ if ! kubectl get pods -n kwasm | grep -q "minikube-provision-kwasm.*Completed";
 fi
 
 echo "=== Step 4: Apply the workload ==="
-kubectl apply -f ../deployments/workloads/workload.yaml
+kubectl apply -f ./tests/workloads/workload.yaml
 
 echo "Waiting for deployment to be ready..."
 kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s

node-installer/kwasm-job.yml renamed to node-installer/tests/workloads/kwasm-job.yml

@@ -0,0 +1 @@
+../../../deployments/workloads/runtime.yaml

node-installer/tests/workloads/runtime.yaml

@@ -0,0 +1 @@
+../../../deployments/workloads/workload.yaml