From 2dead130dae025410ccc4ea3dbb9a256771a350b Mon Sep 17 00:00:00 2001 From: liujian Date: Thu, 17 Apr 2025 18:12:32 +0800 Subject: [PATCH] feat: add deleteDNS parameter in delete_cluster (#2537) Signed-off-by: joyceliu --- .../capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml | 2 +- builtin/core/playbooks/delete_cluster.yaml | 7 +++++++ builtin/core/playbooks/vars/delete_cluster.yaml | 4 +++- builtin/core/roles/uninstall/kubernetes/tasks/main.yaml | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml b/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml index fe11863f..2731d132 100644 --- a/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml +++ b/builtin/capkk/roles/uninstall/kubernetes/tasks/kubernetes.yaml @@ -15,7 +15,7 @@ kubeadm reset -f fi -- name: Delete kubelet +- name: Stop kubelet service command: | rm -rf /etc/systemd/system/kubelet.service rm -rf /etc/systemd/system/kubelet.service.d diff --git a/builtin/core/playbooks/delete_cluster.yaml b/builtin/core/playbooks/delete_cluster.yaml index ef92309c..f49f456a 100644 --- a/builtin/core/playbooks/delete_cluster.yaml +++ b/builtin/core/playbooks/delete_cluster.yaml @@ -13,6 +13,13 @@ - uninstall/kubernetes - role: uninstall/cri when: .deleteCRI + post_tasks: + - name: delete etc/hosts + ignore_errors: true + command: | + sed -i ':a;$!{N;ba};s@# kubekey hosts BEGIN.*# kubekey hosts END@@' /etc/hosts + sed -i ':a;$!{N;ba};s@# kubekey custom BEGIN.*# kubekey custom END@@' /etc/hosts + when: .deleteDNS - hosts: - etcd diff --git a/builtin/core/playbooks/vars/delete_cluster.yaml b/builtin/core/playbooks/vars/delete_cluster.yaml index e115e419..146b4f74 100644 --- a/builtin/core/playbooks/vars/delete_cluster.yaml +++ b/builtin/core/playbooks/vars/delete_cluster.yaml @@ -3,4 +3,6 @@ kubernetes: # if deleteCRI deleteCRI: false # if deleteETCD -deleteETCD: false \ No newline at end of file +deleteETCD: false +# if true. will delete local dns in /etc/hosts which create by kubekey +deleteDNS: false \ No newline at end of file diff --git a/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml b/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml index 80829187..6fa44236 100644 --- a/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml +++ b/builtin/core/roles/uninstall/kubernetes/tasks/main.yaml @@ -4,7 +4,7 @@ command: | kubeadm reset -f -- name: Delete kubelet +- name: Stop kubelet service command: | rm -rf /etc/systemd/system/kubelet.service rm -rf /etc/systemd/system/kubelet.service.d