Browse Source
Fix: kubeadm secondary use file discovery validation
The validation step is moved to the end to avoid the loss of files that
may lead to verification failure.
Signed-off-by: ChengHao Yang <17496418+tico88612@users.noreply.github.com>
pull/12132/head
ChengHao Yang
5 months ago
Failed to extract signature
1 changed files with
11 additions and
11 deletions
roles/kubernetes/control-plane/tasks/kubeadm-secondary.yml
@ -30,17 +30,6 @@
- hostvars[first_kube_control_plane]['kubeadm_upload_cert'] is defined
- hostvars[first_kube_control_plane]['kubeadm_upload_cert'] is not skipped
- name : Create kubeadm ControlPlane config
template:
src : "kubeadm-controlplane.yaml.j2"
dest : "{{ kube_config_dir }}/kubeadm-controlplane.yaml"
mode : "0640"
backup : true
validate : "{{ kubeadm_config_validate_enabled | ternary(bin_dir + '/kubeadm config validate --config %s', omit) }}"
when:
- inventory_hostname != first_kube_control_plane
- not kubeadm_already_run.stat.exists
- name : Wait for k8s apiserver
wait_for:
host : "{{ kubeadm_discovery_address | regex_replace('\\]?:\\d+$', '') | regex_replace('^\\[', '') }}"
@ -84,6 +73,17 @@
- kubeadm_use_file_discovery
- kubeadm_already_run is not defined or not kubeadm_already_run.stat.exists
- name : Create kubeadm ControlPlane config
template:
src : "kubeadm-controlplane.yaml.j2"
dest : "{{ kube_config_dir }}/kubeadm-controlplane.yaml"
mode : "0640"
backup : true
validate : "{{ kubeadm_config_validate_enabled | ternary(bin_dir + '/kubeadm config validate --config %s', omit) }}"
when:
- inventory_hostname != first_kube_control_plane
- not kubeadm_already_run.stat.exists
- name : Joining control plane node to the cluster.
command : >-
{{ bin_dir }}/kubeadm join