Only clean the server and agent directory if it is uninstall

Signed-off-by: Vitor Savian <[email protected]>

install.sh

@@ -829,27 +829,10 @@ do_unmount_and_remove() {
  set -x
 }
 
-clean_mounted_directory() {
- for path in "$1"/*; do
- if [ -d "$path" ]; then
- if grep -q "$path" /proc/mounts; then
- clean_mounted_directory "$path"
- else
- rm -rf "$path"
- fi
- else
- rm "$path"
- fi
- done
-}
-
 do_unmount_and_remove '/run/k3s'
-do_unmount_and_remove '/var/lib/rancher/k3s/data'
-do_unmount_and_remove '/var/lib/rancher/k3s/storage'
 do_unmount_and_remove '/var/lib/kubelet/pods'
 do_unmount_and_remove '/var/lib/kubelet/plugins'
 do_unmount_and_remove '/run/netns/cni-'
-clean_mounted_directory '/var/lib/rancher/k3s'
 
 # Remove CNI namespaces
 ip netns show 2>/dev/null | grep cni- | xargs -r -t -n 1 ip netns delete
@@ -903,10 +886,29 @@ for cmd in kubectl crictl ctr; do
  fi
 done
 
+clean_mounted_directory() {
+ if ! grep -q " \$1" /proc/mounts; then
+ rm -rf "\$1"
+ return 0
+ fi
+
+ for path in "\$1"/*; do
+ if [ -d "\$path" ]; then
+ if grep -q " \$path" /proc/mounts; then
+ clean_mounted_directory "\$path"
+ else
+ rm -rf "\$path"
+ fi
+ else
+ rm "\$path"
+ fi
+ done
+}
+
 rm -rf /etc/rancher/k3s
 rm -rf /run/k3s
 rm -rf /run/flannel
-rm -rf /var/lib/rancher/k3s
+clean_mounted_directory /var/lib/rancher/k3s
 rm -rf /var/lib/kubelet
 rm -f ${BIN_DIR}/k3s
 rm -f ${KILLALL_K3S_SH}

install.sh.sha256sum

@@ -1 +1 @@
-a2b1e04080530d80c0446df5d1504ce4e58ce3ff3c1f3347eeb6198575124851 install.sh
+4d7afed2d7f85019262f61cc32842520fc5bceac1ec6a2b586dab4275bae8b4d install.sh