From c051eccb36a76d4e9ecaa1a056f4222ad94e25cc Mon Sep 17 00:00:00 2001 From: fumingwei Date: Tue, 16 May 2023 16:23:08 +0800 Subject: [PATCH] =?UTF-8?q?bugfix:TSG-14782:=E4=B8=B4=E6=97=B6=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dk3s=E4=B8=8D=E6=96=AD=E4=BA=A7=E7=94=9FCleaned=20up=20?= =?UTF-8?q?orphaned=20pod=20volumes=20dir=E6=97=A5=E5=BF=97=E7=9A=84?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../files/clean_orphaned_pods_dir.sh | 17 +++++++++++++++++ .../files/crontab_clean_orphaned_pods_dir | 1 + ansible/roles/k3s-install/tasks/main.yml | 11 +++++++++++ 3 files changed, 29 insertions(+) create mode 100644 ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh create mode 100644 ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir diff --git a/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh b/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh new file mode 100644 index 00000000..39e542c2 --- /dev/null +++ b/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +KUBELET_HOME=/var/lib +for ((i=1; i<=5; i++)); +do + for podid in $(grep "orphaned pod" /var/log/messages | tail -1 | awk '{print $23}' | sed 's/\\\"//g'); + do + echo $podid + if [ ! -d ${KUBELET_HOME}/kubelet/pods/$podid ]; then + break + fi + + rm -rf ${KUBELET_HOME}/kubelet/pods/$podid/ + #echo ${KUBELET_HOME}/kubelet/pods/$podid/ + done + sleep 2 +done diff --git a/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir b/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir new file mode 100644 index 00000000..c28b0d16 --- /dev/null +++ b/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir @@ -0,0 +1 @@ +0 * * * * /opt/tsg/k3s/scripts/clean_orphaned_pods_dir.sh \ No newline at end of file diff --git a/ansible/roles/k3s-install/tasks/main.yml b/ansible/roles/k3s-install/tasks/main.yml index 0579de81..403b3160 100644 --- a/ansible/roles/k3s-install/tasks/main.yml +++ b/ansible/roles/k3s-install/tasks/main.yml @@ -54,3 +54,14 @@ copy: src: "{{ role_path }}/files/config.yaml" dest: /etc/rancher/k3s/ + +- name: "copy clean_orphaned_pods_dir to dest" + copy: + src: "{{ role_path }}/files/clean_orphaned_pods_dir.sh" + dest: /opt/tsg/k3s/scripts/ + mode: 0755 + +- name: "copy crontab file to dest" + copy: + src: "{{ role_path }}/files/crontab_clean_orphaned_pods_dir" + dest: /var/spool/cron/root