Skip to content

Commit d0fa28a

Browse files
committed
node-installer: remove redundent log collecting
Signed-off-by: Jiaxiao (mossaka) Zhou <[email protected]>
1 parent 01c3e69 commit d0fa28a

File tree

2 files changed

+5
-21
lines changed

2 files changed

+5
-21
lines changed

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

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,11 +51,7 @@ echo "Applying KWasm node installer job..."
5151
kubectl apply -f ./k3s-kwasm-job.yml
5252

5353
echo "Waiting for node installer job to complete..."
54-
if ! kubectl wait -n kwasm --for=jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=k3s-provision-kwasm --timeout=60s; then
55-
echo "Node installer job failed!"
56-
kubectl describe pod -n kwasm
57-
exit 1
58-
fi
54+
kubectl wait -n kwasm --for=jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=k3s-provision-kwasm --timeout=60s
5955

6056
# Verify the SystemdCgroup is set to true
6157
if sudo cat /var/lib/rancher/k3s/agent/etc/containerd/config.toml | grep -A2 "runtimes.spin.options" | grep -q "SystemdCgroup = true"; then
@@ -76,11 +72,7 @@ sudo k3s ctr images pull ghcr.io/spinkube/containerd-shim-spin/examples/spin-rus
7672
kubectl apply -f ./tests/workloads/workload.yaml
7773

7874
echo "Waiting for deployment to be ready..."
79-
if ! kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s; then
80-
echo "Deployment failed to become ready!"
81-
kubectl describe deployment wasm-spin
82-
exit 1
83-
fi
75+
kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s
8476

8577
echo "Checking pod status..."
8678
kubectl get pods

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

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,9 @@ sed -i "s/spin-test-control-plane/${NODE_NAME}/g" minikube-kwasm-job.yml
4141
echo "Applying KWasm node installer job..."
4242
kubectl apply -f ./minikube-kwasm-job.yml
4343

44-
kubectl wait -n kwasm --for=condition=Ready pod --selector=job-name=minikube-provision-kwasm --timeout=90s || true
4544
echo "Waiting for node installer job to complete..."
46-
if ! kubectl wait -n kwasm --for=jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=minikube-provision-kwasm --timeout=60s; then
47-
echo "Node installer job failed!"
48-
kubectl describe pod -n kwasm
49-
exit 1
50-
fi
45+
kubectl wait -n kwasm --for=condition=Ready pod --selector=job-name=minikube-provision-kwasm --timeout=90s || true
46+
kubectl wait -n kwasm --for=jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=minikube-provision-kwasm --timeout=60s
5147

5248
# Verify the SystemdCgroup is set to true
5349
if docker exec $NODE_NAME cat /etc/containerd/config.toml | grep -A5 "spin" | grep -q "SystemdCgroup = true"; then
@@ -67,11 +63,7 @@ echo "=== Step 4: Apply the workload ==="
6763
kubectl apply -f ./tests/workloads/workload.yaml
6864

6965
echo "Waiting for deployment to be ready..."
70-
if ! kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s; then
71-
echo "Deployment failed to become ready!"
72-
kubectl describe po wasm-spin
73-
exit 1
74-
fi
66+
kubectl wait --for=condition=Available deployment/wasm-spin --timeout=120s
7567

7668
echo "Checking pod status..."
7769
kubectl get pods

0 commit comments

Comments
 (0)