Add systemd configuration even if Spin has previously been configured

Signed-off-by: Kate Goldenring <[email protected]>

Author: kate-goldenring

node-installer/script/installer.sh

@@ -61,6 +61,7 @@ mkdir -p $NODE_ROOT$KWASM_DIR/bin/
 cp /assets/containerd-shim-spin-v2 $NODE_ROOT$KWASM_DIR/bin/
 
 if ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
+    echo "Adding Spin runtime to containerd"
     if $IS_K3S; then
         echo '
 [plugins."io.containerd.cri.v1.runtime".containerd.runtimes."spin"]
@@ -70,11 +71,27 @@ if ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
         echo '
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin]
     runtime_type = "'$KWASM_DIR'/bin/containerd-shim-spin-v2"
+' >> $NODE_ROOT$CONTAINERD_CONF
+    fi
+    rm -Rf $NODE_ROOT$KWASM_DIR/active
+fi
+
+# Check if Spin runtime options have not been configured
+# TODO: this should allow for some options to already be configured and just additively 
+# configuring SystemdCgroup
+if ! grep -q 'runtimes.spin.options' $NODE_ROOT$CONTAINERD_CONF; then
+    echo "Setting SystemdCgroup to $SYSTEMD_CGROUP in Spin containerd configuration"
+    if $IS_K3S; then
+        echo '
+[plugins."io.containerd.cri.v1.runtime".containerd.runtimes.spin.options]
+    SystemdCgroup = '$SYSTEMD_CGROUP'
+' >> $NODE_ROOT$CONTAINERD_CONF
+    else
+        echo '
 [plugins."io.containerd.grpc.v1.cri".containerd.runtimes.spin.options]
     SystemdCgroup = '$SYSTEMD_CGROUP'
 ' >> $NODE_ROOT$CONTAINERD_CONF
     fi
-    rm -Rf $NODE_ROOT$KWASM_DIR/active
 fi
 
 if $IS_K3S; then

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

@@ -60,11 +60,10 @@ echo "Applying KWasm node installer job..."
 kubectl apply -f ./microk8s-kwasm-job.yml
 
 echo "Waiting for node installer job to complete..."
-kubectl wait -n kwasm --for=condition=Ready pod --selector=job-name=microk8s-provision-kwasm --timeout=90s || true
 kubectl wait -n kwasm --for=jsonpath='{.status.phase}'=Succeeded pod --selector=job-name=microk8s-provision-kwasm --timeout=60s
 
 # Verify the SystemdCgroup is set to true
-cat /var/snap/microk8s/current/args/containerd.toml | grep -A5 "spin" | grep "SystemdCgroup = true"
+sudo cat /var/snap/microk8s/current/args/containerd.toml | grep -A5 "spin" | grep "SystemdCgroup = true"
 
 if ! kubectl get pods -n kwasm | grep -q "microk8s-provision-kwasm.*Completed"; then
   echo "Node installer job failed!"