diff options
Diffstat (limited to 'roles/kubernetes/kubeadm/control-plane/tasks')
| -rw-r--r-- | roles/kubernetes/kubeadm/control-plane/tasks/primary.yml | 15 | ||||
| -rw-r--r-- | roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml | 8 |
2 files changed, 10 insertions, 13 deletions
diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml b/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml index 65a6f7c8..4204c07d 100644 --- a/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml +++ b/roles/kubernetes/kubeadm/control-plane/tasks/primary.yml @@ -6,7 +6,7 @@ - name: generate kubeadm.config template: - src: kubeadm.config.j2 + src: kubeadm-init.config.j2 dest: /etc/kubernetes/kubeadm.config register: kubeadm_config @@ -16,19 +16,10 @@ when: not kubeconfig_kubelet_stats.stat.exists block: - #### kubeadm wants token to come from --config if --config is used - #### i think this is stupid -> TODO: send bug report - # - name: generate bootstrap token for new cluster - # command: kubeadm token generate - # changed_when: False - # check_mode: no - # register: kubeadm_token_generate - - name: initialize kubernetes primary control-plane node and store log block: - - name: initialize kubernetes primary control-plane node - command: "kubeadm init --config /etc/kubernetes/kubeadm.config --node-name {{ inventory_hostname }} --skip-token-print" - # command: "kubeadm init --config /etc/kubernetes/kubeadm.config --node-name {{ inventory_hostname }} --token '{{ kubeadm_token_generate.stdout }}' --token-ttl 42m --skip-token-print" + - name: initialize kubernetes primary control-plane node + command: "kubeadm init --config /etc/kubernetes/kubeadm.config --skip-token-print" args: creates: /etc/kubernetes/pki/ca.crt register: kubeadm_init diff --git a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml index a2dbe081..965fb03e 100644 --- a/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml +++ b/roles/kubernetes/kubeadm/control-plane/tasks/secondary.yml @@ -25,11 +25,17 @@ set_fact: kubeadm_upload_certs_key: "{% if kubeadm_upload_certs.stdout is defined %}{{ kubeadm_upload_certs.stdout_lines | last }}{% endif %}" +- name: generate kubeadm.config + template: + src: kubeadm-join.config.j2 + dest: /etc/kubernetes/kubeadm.config + register: kubeadm_config + - name: join kubernetes secondary control-plane node and store log block: - name: join kubernetes secondary control-plane node throttle: 1 - command: "kubeadm join 127.0.0.1:6443 --node-name {{ inventory_hostname }} --apiserver-bind-port 6442{% if kubernetes_overlay_node_ip is defined %} --apiserver-advertise-address {{ kubernetes_overlay_node_ip }}{% endif %} --cri-socket {{ kubernetes_cri_socket }} --token '{{ kube_bootstrap_token }}' --discovery-token-ca-cert-hash '{{ kube_bootstrap_ca_cert_hash }}' --control-plane --certificate-key {{ kubeadm_upload_certs_key }}" + command: "kubeadm join --config /etc/kubernetes/kubeadm.config" args: creates: /etc/kubernetes/kubelet.conf register: kubeadm_join |