misc: Fix cleanup with k3s / rke2

When performing the cleanup with k3s / rke2, we must specify the containerd socket address that's been created by them, instead of using the default one. For both k3s and rke2 the containerd address socket is the same: `/run/k3s/containerd/containerd.sock`. Signed-off-by: Fabiano Fidêncio <[email protected]>
containerd · Mar 20, 2024 · 5a8dc31 · 5a8dc31
1 parent c7841c7
commit 5a8dc31
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/misc/snapshotter/snapshotter.sh b/misc/snapshotter/snapshotter.sh
@@ -197,8 +197,13 @@ function cleanup_snapshotter() {
 
     pid=$(ps -ef | grep containerd-nydus-grpc | grep -v grep | awk '{print $1}')
     if [ ! -z "$pid" ]; then
-        for i in $(nsenter -t 1 -m ctr -n k8s.io snapshot --snapshotter nydus list | grep -v KEY | cut -d' ' -f1); do
-            nsenter -t 1 -m ctr -n k8s.io snapshot --snapshotter nydus rm $i || true
+        local ctr_args=""
+        if [[ " k3s k3s-agent rke2-agent rke2-server " =~ " ${CONTAINER_RUNTIME} " ]]; then
+            ctr_args="--address /run/k3s/containerd/containerd.sock "
+        fi
+        ctr_args+="--namespace k8s.io snapshot --snapshotter nydus"
+        for i in $(nsenter -t 1 -m ctr ${ctr_args} list | grep -v KEY | cut -d' ' -f1); do
+            nsenter -t 1 -m ctr ${ctr_args} rm $i || true
         done
     fi
     echo "Recover containerd config"