diff --git a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_containerd.yaml b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_containerd.yaml index 705db287..6adb1045 100644 --- a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_containerd.yaml +++ b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_containerd.yaml @@ -1,10 +1,12 @@ --- - name: Uninstall containerd service + ignore_errors: true command: | systemctl stop containerd.service systemctl disable containerd.service rm -rf /etc/systemd/system/containerd.service* systemctl daemon-reload + systemctl reset-failed containerd.service - name: Delete containerd residue files command: | diff --git a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml index 2d82693d..74c00965 100644 --- a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml +++ b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml @@ -6,6 +6,7 @@ systemctl disable cri-dockerd.service rm -rf /etc/systemd/system/cri-dockerd.service* systemctl daemon-reload + systemctl reset-failed cri-dockerd.service - name: Delete cri-dockerd residue files command: | diff --git a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml index 2642e88d..b223e69c 100644 --- a/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml +++ b/builtin/capkk/roles/uninstall/cri/tasks/uninstall_docker.yaml @@ -5,7 +5,8 @@ systemctl stop docker.service systemctl disable docker.service rm -rf /etc/systemd/system/docker.service* - systemctl daemon-reload + systemctl daemon-reload + systemctl reset-failed docker.service - name: Uninstall containerd include_tasks: uninstall_containerd.yaml diff --git a/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml b/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml index 10389b39..e68ae092 100644 --- a/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml +++ b/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml @@ -16,11 +16,13 @@ fi - name: Stop kubelet service + ignore_errors: true command: | systemctl stop kubelet.service systemctl disable kubelet.service rm -rf /etc/systemd/system/kubelet.service* systemctl daemon-reload + systemctl reset-failed kubelet.service - name: Delete residue files command: | diff --git a/builtin/core/roles/uninstall/cri/tasks/uninstall_containerd.yaml b/builtin/core/roles/uninstall/cri/tasks/uninstall_containerd.yaml index 705db287..6adb1045 100644 --- a/builtin/core/roles/uninstall/cri/tasks/uninstall_containerd.yaml +++ b/builtin/core/roles/uninstall/cri/tasks/uninstall_containerd.yaml @@ -1,10 +1,12 @@ --- - name: Uninstall containerd service + ignore_errors: true command: | systemctl stop containerd.service systemctl disable containerd.service rm -rf /etc/systemd/system/containerd.service* systemctl daemon-reload + systemctl reset-failed containerd.service - name: Delete containerd residue files command: | diff --git a/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml b/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml index 2d82693d..74c00965 100644 --- a/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml +++ b/builtin/core/roles/uninstall/cri/tasks/uninstall_cridockerd.yaml @@ -6,6 +6,7 @@ systemctl disable cri-dockerd.service rm -rf /etc/systemd/system/cri-dockerd.service* systemctl daemon-reload + systemctl reset-failed cri-dockerd.service - name: Delete cri-dockerd residue files command: | diff --git a/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml b/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml index 2642e88d..4d28364c 100644 --- a/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml +++ b/builtin/core/roles/uninstall/cri/tasks/uninstall_docker.yaml @@ -6,6 +6,7 @@ systemctl disable docker.service rm -rf /etc/systemd/system/docker.service* systemctl daemon-reload + systemctl reset-failed docker.service - name: Uninstall containerd include_tasks: uninstall_containerd.yaml diff --git a/builtin/core/roles/uninstall/etcd/tasks/main.yaml b/builtin/core/roles/uninstall/etcd/tasks/main.yaml index 951cb1ab..893de106 100644 --- a/builtin/core/roles/uninstall/etcd/tasks/main.yaml +++ b/builtin/core/roles/uninstall/etcd/tasks/main.yaml @@ -8,6 +8,7 @@ systemctl disable etcd.service rm -rf /etc/systemd/system/etcd.service* systemctl daemon-reload + systemctl reset-failed etcd.service - name: Unset Traffic Priority command: | tc filter del dev eth0 parent 1: protocol ip prio 1 u32 match ip sport 2379 0xffff diff --git a/builtin/core/roles/uninstall/image_registry/tasks/harbor.yaml b/builtin/core/roles/uninstall/image_registry/tasks/harbor.yaml index c2dbdbc8..258f155b 100644 --- a/builtin/core/roles/uninstall/image_registry/tasks/harbor.yaml +++ b/builtin/core/roles/uninstall/image_registry/tasks/harbor.yaml @@ -1,9 +1,11 @@ - name: Stop harbor service + ignore_errors: true command: | systemctl stop harbor.service systemctl disable harbor.service rm -rf /etc/systemd/system/harbor.service* systemctl daemon-reload + systemctl reset-failed harbor.service - name: Delete residue harbor files command: | diff --git a/builtin/core/roles/uninstall/image_registry/tasks/registry.yaml b/builtin/core/roles/uninstall/image_registry/tasks/registry.yaml index 97e169b1..f3dc731b 100644 --- a/builtin/core/roles/uninstall/image_registry/tasks/registry.yaml +++ b/builtin/core/roles/uninstall/image_registry/tasks/registry.yaml @@ -1,9 +1,11 @@ - name: Stop registry service + ignore_errors: true command: | systemctl stop registry.service systemctl disable registry.service rm -rf /etc/systemd/system/registry.service* systemctl daemon-reload + systemctl reset-failed registry.service - name: unmount nfs when: diff --git a/builtin/core/roles/uninstall/kubernetes/tasks/kubernetes.yaml b/builtin/core/roles/uninstall/kubernetes/tasks/kubernetes.yaml index 5a64ca95..f09fbb31 100644 --- a/builtin/core/roles/uninstall/kubernetes/tasks/kubernetes.yaml +++ b/builtin/core/roles/uninstall/kubernetes/tasks/kubernetes.yaml @@ -5,11 +5,13 @@ kubeadm reset -f - name: Stop kubelet service + ignore_errors: true command: | systemctl stop kubelet.service systemctl disable kubelet.service rm -rf /etc/systemd/system/kubelet.service* systemctl daemon-reload + systemctl reset-failed kubelet.service - name: Delete residue files command: |