diff --git a/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh b/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh index 39e542c2..0b98315c 100644 --- a/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh +++ b/ansible/roles/k3s-install/files/clean_orphaned_pods_dir.sh @@ -3,7 +3,7 @@ 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'); + for podid in $(grep -a "orphaned pod" /var/log/messages | tail -1 | awk '{print $23}' | sed 's/\\\"//g'); do echo $podid if [ ! -d ${KUBELET_HOME}/kubelet/pods/$podid ]; then diff --git a/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir b/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir deleted file mode 100644 index c28b0d16..00000000 --- a/ansible/roles/k3s-install/files/crontab_clean_orphaned_pods_dir +++ /dev/null @@ -1 +0,0 @@ -0 * * * * /opt/tsg/k3s/scripts/clean_orphaned_pods_dir.sh \ No newline at end of file diff --git a/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.service b/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.service new file mode 100644 index 00000000..1fc7925d --- /dev/null +++ b/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.service @@ -0,0 +1,11 @@ +[Unit] +Description=Cleanup K3S Orphaned Pods Dir +DefaultDependencies=no +Conflicts=shutdown.target +After=local-fs.target time-sync.target +Before=shutdown.target + +[Service] +Type=oneshot +ExecStart=/opt/tsg/k3s/scripts/clean_orphaned_pods_dir.sh +IOSchedulingClass=idle diff --git a/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.timer b/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.timer new file mode 100644 index 00000000..1d744d66 --- /dev/null +++ b/ansible/roles/k3s-install/files/k3s-orphaned-pods-dir-clean.timer @@ -0,0 +1,9 @@ +[Unit] +Description=Daily Cleanup K3S Orphaned Pods Dir + +[Timer] +OnBootSec=15min +OnUnitActiveSec=1d + +[Install] +WantedBy=timers.target \ 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 cdc4ab24..e7b20b6c 100644 --- a/ansible/roles/k3s-install/tasks/main.yml +++ b/ansible/roles/k3s-install/tasks/main.yml @@ -61,12 +61,22 @@ 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 - - name: "copy override service file to dest" copy: src: "{{ role_path }}/files/service_set_RuntimeMaxSec.conf" dest: /usr/lib/systemd/system/k3s.service.d/ + +- name: "copy k3s-orphaned-pods-dir-clean.service to destination" + copy: + src: "{{ role_path }}/files/k3s-orphaned-pods-dir-clean.service" + dest: /usr/lib/systemd/system/ + +- name: "copy k3s-orphaned-pods-dir-clean.timer to destination" + copy: + src: "{{ role_path }}/files/k3s-orphaned-pods-dir-clean.timer" + dest: /usr/lib/systemd/system/ + +- name: "enable k3s-orphaned-pods-dir-clean.timer" + systemd: + name: k3s-orphaned-pods-dir-clean.timer + enabled: yes \ No newline at end of file