diff options
| -rw-r--r-- | group_vars/k8s-emc/vars.yml | 2 | ||||
| -rw-r--r-- | playbooks/k8s-emc.yaml | 5 | ||||
| -rw-r--r-- | roles/kubernetes-node/tasks/add.yml | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/group_vars/k8s-emc/vars.yml b/group_vars/k8s-emc/vars.yml index a07b5fac..ab9604ec 100644 --- a/group_vars/k8s-emc/vars.yml +++ b/group_vars/k8s-emc/vars.yml @@ -22,7 +22,7 @@ kubernetes: emc-03: 3 emc-04: 4 emc-test: 99 - emc-master: 100 + emc-00: 100 dione: 101 helene: 102 emc-stats: 120 diff --git a/playbooks/k8s-emc.yaml b/playbooks/k8s-emc.yaml index 06b855cd..d5d08bff 100644 --- a/playbooks/k8s-emc.yaml +++ b/playbooks/k8s-emc.yaml @@ -84,6 +84,11 @@ with_items: "{{ groups['_k8s-emc-remove_'] | default([]) }}" command: "kubectl delete node {{ item }}" + - name: wait a litte before removing bootstrap-token so new nodes have time to generate certificates for themselves + when: kube_bootstrap_token != "" + pause: + seconds: 42 + - 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-node/tasks/add.yml b/roles/kubernetes-node/tasks/add.yml index 5b2eb9bc..c68a54cc 100644 --- a/roles/kubernetes-node/tasks/add.yml +++ b/roles/kubernetes-node/tasks/add.yml @@ -3,7 +3,7 @@ set_fact: kube_master_vars: "{{ hostvars[kubernetes_nodes_master] }}" -- name: set up kubernetes master +- name: join kubernetes node 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 |