From 22e9335484dda6208bb78c1923eb825b1f42168d Mon Sep 17 00:00:00 2001 From: k8s-infra-cherrypick-robot <90416843+k8s-infra-cherrypick-robot@users.noreply.github.com> Date: Sat, 28 Jun 2025 05:44:29 -0700 Subject: [PATCH] fix(kubeadm): Conditionally add --skip-phases flag for v1.32.0+ (#12354) Signed-off-by: bo.jiang Co-authored-by: bo.jiang --- roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml b/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml index 451b6f0b0..44b7e1eec 100644 --- a/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml +++ b/roles/kubernetes/control-plane/tasks/kubeadm-upgrade.yml @@ -18,7 +18,9 @@ {%- else %} --config={{ kube_config_dir }}/kubeadm-config.yaml {%- endif %} + {%- if kube_version is version('1.32.0', '>=') %} --skip-phases={{ kubeadm_init_phases_skip | join(',') }} + {%- endif %} register: kubeadm_upgrade when: inventory_hostname == first_kube_control_plane failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr @@ -37,7 +39,9 @@ {%- else %} --config={{ kube_config_dir }}/kubeadm-config.yaml {%- endif %} + {%- if kube_version is version('1.32.0', '>=') %} --skip-phases={{ kubeadm_init_phases_skip | join(',') }} + {%- endif %} register: kubeadm_upgrade when: inventory_hostname != first_kube_control_plane failed_when: kubeadm_upgrade.rc != 0 and "field is immutable" not in kubeadm_upgrade.stderr