Add K8s version args to secondary control plane nodes in node upgrader (

#9319) From K8s 1.32 node upgrader scheduled in secondary control plane nodes will need the K8s version to add some version specific flags. Signed-off-by: Rahul Ganesh <[email protected]> Co-authored-by: Rahul Ganesh <[email protected]>
aws · Feb 26, 2025 · a573b75 · a573b75
1 parent afc92e3
commit a573b75
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/controllers/nodeupgrade_controller.go b/controllers/nodeupgrade_controller.go
@@ -184,7 +184,7 @@ func (r *NodeUpgradeReconciler) reconcile(ctx context.Context, log logr.Logger,
 		if nodeUpgrade.Spec.FirstNodeToBeUpgraded {
 			upgraderPod = upgrader.UpgradeFirstControlPlanePod(node.Name, upgraderImage, nodeUpgrade.Spec.KubernetesVersion, *nodeUpgrade.Spec.EtcdVersion)
 		} else {
-			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, upgraderImage)
+			upgraderPod = upgrader.UpgradeSecondaryControlPlanePod(node.Name, upgraderImage, nodeUpgrade.Spec.KubernetesVersion)
 		}
 	} else {
 		upgraderPod = upgrader.UpgradeWorkerPod(node.Name, upgraderImage)

diff --git a/pkg/nodeupgrader/testdata/expected_rest_control_plane_upgrader_pod.yaml b/pkg/nodeupgrader/testdata/expected_rest_control_plane_upgrader_pod.yaml
@@ -86,6 +86,8 @@ spec:
     - node
     - --type
     - RestCP
+    - --k8sVersion
+    - v1.28.3-eks-1-28-9
     command:
     - nsenter
     image: public.ecr.aws/eks-anywhere/node-upgrader:latest

diff --git a/pkg/nodeupgrader/upgrader.go b/pkg/nodeupgrader/upgrader.go
@@ -45,9 +45,9 @@ func UpgradeFirstControlPlanePod(nodeName, image, kubernetesVersion, etcdVersion
 }
 
 // UpgradeSecondaryControlPlanePod returns an upgrader pod that can be deployed on the remaining control plane nodes.
-func UpgradeSecondaryControlPlanePod(nodeName, image string) *corev1.Pod {
+func UpgradeSecondaryControlPlanePod(nodeName, image, kubernetesVersion string) *corev1.Pod {
 	p := upgraderPod(nodeName, image, true)
-	p.Spec.InitContainers = containersForUpgrade(true, image, nodeName, "upgrade", "node", "--type", "RestCP")
+	p.Spec.InitContainers = containersForUpgrade(true, image, nodeName, "upgrade", "node", "--type", "RestCP", "--k8sVersion", kubernetesVersion)
 	return p
 }
 

diff --git a/pkg/nodeupgrader/upgrader_test.go b/pkg/nodeupgrader/upgrader_test.go
@@ -29,7 +29,7 @@ func TestUpgradeFirstControlPlanePod(t *testing.T) {
 
 func TestUpgradeSecondaryControlPlanePod(t *testing.T) {
 	g := NewWithT(t)
-	pod := nodeupgrader.UpgradeSecondaryControlPlanePod(nodeName, upgraderImage)
+	pod := nodeupgrader.UpgradeSecondaryControlPlanePod(nodeName, upgraderImage, kubernetesVersion)
 	g.Expect(pod).ToNot(BeNil())
 
 	data, err := yaml.Marshal(pod)