From ad7ab2cd37423c2f4422cb634aded9cf231aae4d Mon Sep 17 00:00:00 2001 From: Chad Swenson Date: Wed, 3 Sep 2025 10:25:16 -0500 Subject: [PATCH] [release-2.28] Fix automated cherrypick failure in UpgradeConfiguration.node (#12524) --- .../control-plane/templates/kubeadm-config.v1beta4.yaml.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 index 865f3dc04..69b383ee0 100644 --- a/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 +++ b/roles/kubernetes/control-plane/templates/kubeadm-config.v1beta4.yaml.j2 @@ -502,7 +502,7 @@ apply: {% endif %} imagePullPolicy: {{ k8s_image_pull_policy }} imagePullSerial: {{ kubeadm_image_pull_serial | lower }} -{% for skip_phase in kubeadm_upgrade_node_phases_skip %} +{% for skip_phase in kubeadm_init_phases_skip %} {% if loop.first %} skipPhases: {% endif %} @@ -523,7 +523,7 @@ node: {% endif %} imagePullPolicy: {{ k8s_image_pull_policy }} imagePullSerial: {{ kubeadm_image_pull_serial | lower }} -{% for skip_phase in kubeadm_init_phases_skip %} +{% for skip_phase in kubeadm_upgrade_node_phases_skip %} {% if loop.first %} skipPhases: {% endif %}