From 61d0bb2b517832e62bd103a8bdddfbd7e8848fc8 Mon Sep 17 00:00:00 2001 From: liujian Date: Wed, 16 Apr 2025 10:28:30 +0800 Subject: [PATCH] feat: add more ignore_errors when kk delete (#2533) Signed-off-by: joyceliu --- .../cri/tasks/uninstall_cridockerd.yaml | 3 ++- .../uninstall/cri/tasks/uninstall_docker.yaml | 3 ++- .../cri/tasks/uninstall_cridockerd.yaml | 3 ++- .../uninstall/cri/tasks/uninstall_docker.yaml | 3 ++- .../core/roles/uninstall/etcd/tasks/main.yaml | 21 +++++++------------ .../uninstall/kubernetes/tasks/main.yaml | 1 + 6 files changed, 17 insertions(+), 17 deletions(-) diff --git a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml index 2bb64baa..afe0da91 100644 --- a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml +++ b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml @@ -1,5 +1,6 @@ --- -- name: Stop cri-dockerd +- name: Stop cri-dockerd service + ignore_errors: true command: | systemctl stop cri-dockerd && systemctl disable cri-dockerd rm -f /etc/systemd/system/cri-dockerd.service && systemctl daemon-reload diff --git a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml index b0be25d3..7f8d1ee7 100644 --- a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml +++ b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml @@ -1,5 +1,6 @@ --- -- name: Stop Docker +- name: Stop docker service + ignore_errors: true command: | systemctl stop docker && systemctl disable docker rm -f /etc/systemd/system/docker.service && systemctl daemon-reload diff --git a/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml b/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml index 2bb64baa..afe0da91 100644 --- a/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml +++ b/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml @@ -1,5 +1,6 @@ --- -- name: Stop cri-dockerd +- name: Stop cri-dockerd service + ignore_errors: true command: | systemctl stop cri-dockerd && systemctl disable cri-dockerd rm -f /etc/systemd/system/cri-dockerd.service && systemctl daemon-reload diff --git a/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml b/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml index b0be25d3..7f8d1ee7 100644 --- a/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml +++ b/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml @@ -1,5 +1,6 @@ --- -- name: Stop Docker +- name: Stop docker service + ignore_errors: true command: | systemctl stop docker && systemctl disable docker rm -f /etc/systemd/system/docker.service && systemctl daemon-reload diff --git a/builtin/core/roles/uninstall/etcd/tasks/main.yaml b/builtin/core/roles/uninstall/etcd/tasks/main.yaml index a86aba18..012bf649 100644 --- a/builtin/core/roles/uninstall/etcd/tasks/main.yaml +++ b/builtin/core/roles/uninstall/etcd/tasks/main.yaml @@ -2,16 +2,15 @@ - name: Uninstall etcd service block: - name: Stop etcd service + ignore_errors: true command: | systemctl stop etcd.service && systemctl disable etcd.service + rm /etc/systemd/system/etcd.service && systemctl daemon-reload - name: Unset Traffic Priority command: | tc filter del dev eth0 parent 1: protocol ip prio 1 u32 match ip sport 2379 0xffff tc filter del dev eth0 parent 1: protocol ip prio 1 u32 match ip sport 2380 0xffff when: .etcd.traffic_priority - - name: Remove etcd service - command: | - rm /etc/systemd/system/etcd.service && systemctl daemon-reload - name: Delete residue files command: | rm -rf {{ .etcd.env.data_dir }} @@ -20,13 +19,9 @@ rm -rf /usr/local/bin/etcd* - name: Uninstall backup-etcd service - block: - - name: Stop backup-etcd service - command: | - systemctl disable --now backup-etcd.timer - - name: Remove backup-etcd service - command: | - rm /etc/systemd/system/backup-etcd.timer - rm /etc/systemd/system/backup-etcd.service - rm /usr/local/bin/kube-scripts/backup_etcd.sh - systemctl daemon-reexec && systemctl daemon-reload + command: | + systemctl disable --now backup-etcd.timer + rm /etc/systemd/system/backup-etcd.timer + rm /etc/systemd/system/backup-etcd.service + rm /usr/local/bin/kube-scripts/backup_etcd.sh + systemctl daemon-reexec && systemctl daemon-reload diff --git a/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml b/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml index 4146f9eb..80829187 100644 --- a/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml +++ b/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml @@ -1,5 +1,6 @@ --- - name: Reset kubeadm + ignore_errors: true command: | kubeadm reset -f