mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2025-12-14 05:45:06 +03:00
fix(kubeadm): Conditionally add --skip-phases flag for v1.32.0+ (#12351)
Signed-off-by: bo.jiang <bo.jiang@daocloud.io>
This commit is contained in:
@@ -18,7 +18,9 @@
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
--config={{ kube_config_dir }}/kubeadm-config.yaml
|
--config={{ kube_config_dir }}/kubeadm-config.yaml
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
{%- if kube_version is version('1.32.0', '>=') %}
|
||||||
--skip-phases={{ kubeadm_init_phases_skip | join(',') }}
|
--skip-phases={{ kubeadm_init_phases_skip | join(',') }}
|
||||||
|
{%- endif %}
|
||||||
register: kubeadm_upgrade
|
register: kubeadm_upgrade
|
||||||
when: inventory_hostname == first_kube_control_plane
|
when: inventory_hostname == first_kube_control_plane
|
||||||
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
|
||||||
@@ -37,7 +39,9 @@
|
|||||||
{%- else %}
|
{%- else %}
|
||||||
--config={{ kube_config_dir }}/kubeadm-config.yaml
|
--config={{ kube_config_dir }}/kubeadm-config.yaml
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
{%- if kube_version is version('1.32.0', '>=') %}
|
||||||
--skip-phases={{ kubeadm_init_phases_skip | join(',') }}
|
--skip-phases={{ kubeadm_init_phases_skip | join(',') }}
|
||||||
|
{%- endif %}
|
||||||
register: kubeadm_upgrade
|
register: kubeadm_upgrade
|
||||||
when: inventory_hostname != first_kube_control_plane
|
when: inventory_hostname != first_kube_control_plane
|
||||||
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
|
||||||
|
|||||||
Reference in New Issue
Block a user