Add data-dir to uninstall and killall scripts

Signed-off-by: Jake Hyde <jakefhyde@gmail.com>
pull/10494/head
Jake Hyde 5 months ago committed by Brad Davidson
parent d1709d60ce
commit b045465178

@ -767,7 +767,9 @@ create_killall() {
#!/bin/sh #!/bin/sh
[ $(id -u) -eq 0 ] || exec sudo $0 $@ [ $(id -u) -eq 0 ] || exec sudo $0 $@
for bin in /var/lib/rancher/k3s/data/**/bin/; do K3S_DATA_DIR=${K3S_DATA_DIR:-/var/lib/rancher/k3s}
for bin in ${K3S_DATA_DIR}/data/**/bin/; do
[ -d $bin ] && export PATH=$PATH:$bin:$bin/aux [ -d $bin ] && export PATH=$PATH:$bin:$bin/aux
done done
@ -841,7 +843,7 @@ do_unmount_and_remove() {
} }
do_unmount_and_remove '/run/k3s' do_unmount_and_remove '/run/k3s'
do_unmount_and_remove '/var/lib/rancher/k3s' do_unmount_and_remove "${K3S_DATA_DIR}"
do_unmount_and_remove '/var/lib/kubelet/pods' do_unmount_and_remove '/var/lib/kubelet/pods'
do_unmount_and_remove '/var/lib/kubelet/plugins' do_unmount_and_remove '/var/lib/kubelet/plugins'
do_unmount_and_remove '/run/netns/cni-' do_unmount_and_remove '/run/netns/cni-'
@ -868,6 +870,8 @@ create_uninstall() {
set -x set -x
[ \$(id -u) -eq 0 ] || exec sudo \$0 \$@ [ \$(id -u) -eq 0 ] || exec sudo \$0 \$@
K3S_DATA_DIR=\${K3S_DATA_DIR:-/var/lib/rancher/k3s}
${KILLALL_K3S_SH} ${KILLALL_K3S_SH}
if command -v systemctl; then if command -v systemctl; then
@ -901,7 +905,7 @@ done
rm -rf /etc/rancher/k3s rm -rf /etc/rancher/k3s
rm -rf /run/k3s rm -rf /run/k3s
rm -rf /run/flannel rm -rf /run/flannel
rm -rf /var/lib/rancher/k3s rm -rf \${K3S_DATA_DIR}
rm -rf /var/lib/kubelet rm -rf /var/lib/kubelet
rm -f ${BIN_DIR}/k3s rm -f ${BIN_DIR}/k3s
rm -f ${KILLALL_K3S_SH} rm -f ${KILLALL_K3S_SH}

@ -1 +1 @@
a5a95f60c57049a1d4eb11953e60d80f5f7e2fae4c7865959da669b48a44e668 install.sh 937085bbac8e3b55209739762e05c2c1006c4f4fe65dba01908f3544dc47da27 install.sh

Loading…
Cancel
Save