Skip to content
Snippets Groups Projects
Commit 1ad1e80a authored by Erwan Miran's avatar Erwan Miran Committed by k8s-ci-robot
Browse files

Checking new CA key presence is not relevant to determine if kubeadm has already run (#3653)

parent dfdf5307
No related branches found
No related tags found
No related merge requests found
...@@ -15,14 +15,14 @@ ...@@ -15,14 +15,14 @@
- name: kubeadm | Check if kubeadm has already run - name: kubeadm | Check if kubeadm has already run
stat: stat:
path: "{{ kube_cert_dir }}/ca.key" path: "/var/lib/kubelet/config.yaml"
register: kubeadm_ca register: kubeadm_already_run
- name: kubeadm | Delete old admin.conf - name: kubeadm | Delete old admin.conf
file: file:
path: "{{ kube_config_dir }}/admin.conf" path: "{{ kube_config_dir }}/admin.conf"
state: absent state: absent
when: not kubeadm_ca.stat.exists when: not kubeadm_already_run.stat.exists
- name: kubeadm | Delete old static pods - name: kubeadm | Delete old static pods
file: file:
...@@ -115,7 +115,7 @@ ...@@ -115,7 +115,7 @@
register: kubeadm_init register: kubeadm_init
# Retry is because upload config sometimes fails # Retry is because upload config sometimes fails
retries: 3 retries: 3
when: inventory_hostname == groups['kube-master']|first and not kubeadm_ca.stat.exists when: inventory_hostname == groups['kube-master']|first and not kubeadm_already_run.stat.exists
failed_when: kubeadm_init.rc != 0 and "field is immutable" not in kubeadm_init.stderr failed_when: kubeadm_init.rc != 0 and "field is immutable" not in kubeadm_init.stderr
notify: Master | restart kubelet notify: Master | restart kubelet
...@@ -132,7 +132,7 @@ ...@@ -132,7 +132,7 @@
register: kubeadm_upgrade register: kubeadm_upgrade
# Retry is because upload config sometimes fails # Retry is because upload config sometimes fails
retries: 3 retries: 3
when: inventory_hostname == groups['kube-master']|first and (kubeadm_config.changed and kubeadm_ca.stat.exists) when: inventory_hostname == groups['kube-master']|first and (kubeadm_config.changed and kubeadm_already_run.stat.exists)
failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr
notify: Master | restart kubelet notify: Master | restart kubelet
...@@ -177,7 +177,7 @@ ...@@ -177,7 +177,7 @@
- name: kubeadm | Init other uninitialized masters - name: kubeadm | Init other uninitialized masters
command: timeout -k 600s 600s {{ bin_dir }}/kubeadm init --config={{ kube_config_dir }}/kubeadm-config.{{ kubeadmConfig_api_version }}.yaml --ignore-preflight-errors=all command: timeout -k 600s 600s {{ bin_dir }}/kubeadm init --config={{ kube_config_dir }}/kubeadm-config.{{ kubeadmConfig_api_version }}.yaml --ignore-preflight-errors=all
register: kubeadm_init register: kubeadm_init
when: inventory_hostname != groups['kube-master']|first and not kubeadm_ca.stat.exists when: inventory_hostname != groups['kube-master']|first and not kubeadm_already_run.stat.exists
failed_when: kubeadm_init.rc != 0 and "field is immutable" not in kubeadm_init.stderr failed_when: kubeadm_init.rc != 0 and "field is immutable" not in kubeadm_init.stderr
notify: Master | restart kubelet notify: Master | restart kubelet
...@@ -191,7 +191,7 @@ ...@@ -191,7 +191,7 @@
--allow-experimental-upgrades --allow-experimental-upgrades
--allow-release-candidate-upgrades --allow-release-candidate-upgrades
register: kubeadm_upgrade register: kubeadm_upgrade
when: inventory_hostname != groups['kube-master']|first and (kubeadm_config.changed and kubeadm_ca.stat.exists) when: inventory_hostname != groups['kube-master']|first and (kubeadm_config.changed and kubeadm_already_run.stat.exists)
failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr
notify: Master | restart kubelet notify: Master | restart kubelet
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment