diff options
| author | Christian Pointner <equinox@spreadspace.org> | 2018-02-02 23:32:25 +0100 |
|---|---|---|
| committer | Christian Pointner <equinox@spreadspace.org> | 2018-02-02 23:32:25 +0100 |
| commit | 22e9e44e8edb1029640ab5e32e7be459ea8bdb28 (patch) | |
| tree | f30bf3ebebd52066a3ebf5ddf8baaca11c468021 | |
| parent | removing node from kubernetes works now (diff) | |
cleanup works now
| -rw-r--r-- | playbooks/k8s-emc.yaml | 8 | ||||
| -rw-r--r-- | roles/kubernetes-master/tasks/main.yml | 3 |
2 files changed, 7 insertions, 4 deletions
diff --git a/playbooks/k8s-emc.yaml b/playbooks/k8s-emc.yaml index e1ec695e..7c6a21dd 100644 --- a/playbooks/k8s-emc.yaml +++ b/playbooks/k8s-emc.yaml @@ -65,6 +65,10 @@ group: k8s-emc-remove changed_when: False + - name: drain superflous nodes + with_items: "{{ groups['k8s-emc-remove'] | default([]) }}" + command: "kubectl drain {{ item }} --delete-local-data --force --ignore-daemonsets" + - name: try to clean superflous nodes hosts: k8s-emc-remove vars: @@ -80,4 +84,6 @@ with_items: "{{ groups['k8s-emc-remove'] | default([]) }}" command: "kubectl delete node {{ item }}" - # TODO: remove boostrap token + - name: remove bootstrap-token + when: kube_bootstrap_token != "" + command: "kubectl --namespace kube-system delete secret bootstrap-token-{{ kube_bootstrap_token.split('.') | first }}" diff --git a/roles/kubernetes-master/tasks/main.yml b/roles/kubernetes-master/tasks/main.yml index 373ab09e..f75ec11f 100644 --- a/roles/kubernetes-master/tasks/main.yml +++ b/roles/kubernetes-master/tasks/main.yml @@ -86,9 +86,6 @@ kube_bootstrap_token: "{% if kubeadm_token_generate.stdout is defined %}{{ kubeadm_token_generate.stdout }}{% elif kubeadm_token_create.stdout is defined %}{{ kubeadm_token_create.stdout }}{% endif %}" kube_bootstrap_ca_cert_hash: "sha256:{{ kube_ca_openssl.stdout }}" -- debug: - var: kube_bootstrap_token - - name: prepare kubectl (1/2) file: name: /root/.kube |