node-installer: K3S & RKE2 can detect spin shim, no need to configure

Signed-off-by: Shiroki Satsuki <[email protected]>

Author: shirok1

node-installer/script/installer.sh

@@ -22,12 +22,8 @@ if pgrep -f snap/microk8s > /dev/null; then
     fi
 elif ls $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml > /dev/null 2>&1 ; then
     IS_RKE2_AGENT=true
-    cp $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml $NODE_ROOT/var/lib/rancher/rke2/agent/etc/containerd/config.toml.tmpl
-    CONTAINERD_CONF=/var/lib/rancher/rke2/agent/etc/containerd/config.toml.tmpl
 elif ls $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml > /dev/null 2>&1 ; then
     IS_K3S=true
-    cp $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml $NODE_ROOT/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
-    CONTAINERD_CONF=/var/lib/rancher/k3s/agent/etc/containerd/config.toml.tmpl
 elif pgrep -f /var/lib/k0s/bin/kubelet > /dev/null; then
     IS_K0S_WORKER=true
     CONTAINERD_CONF=/etc/k0s/containerd.d/spin.toml
@@ -38,7 +34,9 @@ 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
+# K3S and RKE2 can detect spin shim themselves, no need to configure
+# https://github.com/k3s-io/k3s/pull/9519
+if ! ( $IS_K3S || $IS_RKE2_AGENT ) && ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
     if grep -q "version = 3" $NODE_ROOT$CONTAINERD_CONF; then
         echo '
 [plugins."io.containerd.cri.v1.runtime".containerd.runtimes."spin"]
@@ -53,10 +51,6 @@ if ! grep -q spin $NODE_ROOT$CONTAINERD_CONF; then
     rm -Rf $NODE_ROOT$KWASM_DIR/active
 fi
 
-if $IS_K3S; then
-    sed -i "s|runtime_type = \"io.containerd.spin.*\"|runtime_type = \"$KWASM_DIR/bin/containerd-shim-spin-v2\"|g" $NODE_ROOT$CONTAINERD_CONF
-fi
-
 if [ ! -f $NODE_ROOT$KWASM_DIR/active ]; then
     touch $NODE_ROOT$KWASM_DIR/active
     if $IS_MICROK8S; then