From 1d659c487ab5c67a4105aaadc5e0f83c60a28709 Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Fri, 2 Feb 2018 22:55:39 +0100 Subject: removing node from kubernetes works now --- roles/kubernetes-node/tasks/add.yml | 16 ++++++++++++++++ roles/kubernetes-node/tasks/main.yml | 20 ++++++-------------- roles/kubernetes-node/tasks/remove.yml | 3 +++ 3 files changed, 25 insertions(+), 14 deletions(-) create mode 100644 roles/kubernetes-node/tasks/add.yml create mode 100644 roles/kubernetes-node/tasks/remove.yml (limited to 'roles/kubernetes-node') diff --git a/roles/kubernetes-node/tasks/add.yml b/roles/kubernetes-node/tasks/add.yml new file mode 100644 index 00000000..5b2eb9bc --- /dev/null +++ b/roles/kubernetes-node/tasks/add.yml @@ -0,0 +1,16 @@ +--- +- name: get master vars + set_fact: + kube_master_vars: "{{ hostvars[kubernetes_nodes_master] }}" + +- name: set up kubernetes master + command: "kubeadm join --token {{ kube_master_vars.kube_bootstrap_token }} {{ kube_master_vars.ansible_default_ipv4.address }}:6443 --discovery-token-ca-cert-hash {{ kube_master_vars.kube_bootstrap_ca_cert_hash }}" + args: + creates: /etc/kubernetes/kubelet.conf + register: kubeadm_join + +- name: dump output of kubeadm join to log file + when: kubeadm_join.changed + copy: + content: "{{ kubeadm_join.stdout }}\n" + dest: /etc/kubernetes/kubeadm-join.log diff --git a/roles/kubernetes-node/tasks/main.yml b/roles/kubernetes-node/tasks/main.yml index 5b2eb9bc..d078d2fb 100644 --- a/roles/kubernetes-node/tasks/main.yml +++ b/roles/kubernetes-node/tasks/main.yml @@ -1,16 +1,8 @@ --- -- name: get master vars - set_fact: - kube_master_vars: "{{ hostvars[kubernetes_nodes_master] }}" +- name: add node cluster + include_tasks: add.yml + when: k8s_remove_node is not defined -- name: set up kubernetes master - command: "kubeadm join --token {{ kube_master_vars.kube_bootstrap_token }} {{ kube_master_vars.ansible_default_ipv4.address }}:6443 --discovery-token-ca-cert-hash {{ kube_master_vars.kube_bootstrap_ca_cert_hash }}" - args: - creates: /etc/kubernetes/kubelet.conf - register: kubeadm_join - -- name: dump output of kubeadm join to log file - when: kubeadm_join.changed - copy: - content: "{{ kubeadm_join.stdout }}\n" - dest: /etc/kubernetes/kubeadm-join.log +- name: remove node from cluster + include_tasks: remove.yml + when: k8s_remove_node is defined diff --git a/roles/kubernetes-node/tasks/remove.yml b/roles/kubernetes-node/tasks/remove.yml new file mode 100644 index 00000000..95787629 --- /dev/null +++ b/roles/kubernetes-node/tasks/remove.yml @@ -0,0 +1,3 @@ +--- +- name: clean up settings and files created by kubeadm + command: kubeadm reset -- cgit v1.2.3