summaryrefslogtreecommitdiff
path: root/roles/kubernetes/kubeadm/node/tasks/main.yml
diff options
context:
space:
mode:
Diffstat (limited to 'roles/kubernetes/kubeadm/node/tasks/main.yml')
-rw-r--r--roles/kubernetes/kubeadm/node/tasks/main.yml13
1 files changed, 4 insertions, 9 deletions
diff --git a/roles/kubernetes/kubeadm/node/tasks/main.yml b/roles/kubernetes/kubeadm/node/tasks/main.yml
index 9f0057f9..2a140099 100644
--- a/roles/kubernetes/kubeadm/node/tasks/main.yml
+++ b/roles/kubernetes/kubeadm/node/tasks/main.yml
@@ -1,18 +1,13 @@
---
-- name: get master vars
- set_fact:
- kube_bootstrap_token: "{{ hostvars[kubernetes_master].kube_bootstrap_token }}"
- kube_bootstrap_ca_cert_hash: "{{ hostvars[kubernetes_master].kube_bootstrap_ca_cert_hash }}"
- kube_master_addr: "{{ kubernetes.api_advertise_ip | default(hostvars[kubernetes_master].ansible_default_ipv4.address) }}"
-
- name: join kubernetes node
- command: "kubeadm join --token {{ kube_bootstrap_token }} {{ kube_master_addr }}:6443 --discovery-token-ca-cert-hash {{ kube_bootstrap_ca_cert_hash }}"
+ command: "kubeadm join {{ host_vars[groups['_kubernetes_primary_master_']].kubernetes_kubelet_node_ip }}:6443{% if kubernetes_cri_socket is defined %} --cri-socket {{ kubernetes_cri_socket }}{% endif %} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ 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:
+ when: kubeadm_join is changed
+ # This is not a handler by design to make sure this action runs at this point of the play.
+ copy: # noqa 503
content: "{{ kubeadm_join.stdout }}\n"
dest: /etc/kubernetes/kubeadm-join.log