Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-0.22] Add K8s version arg to secondary control plane nodes in node upgrader #9320

Merged
merged 1 commit into from
Feb 26, 2025
Merged

[release-0.22] Add K8s version arg to secondary control plane nodes in node upgrader #9320

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion controllers/nodeupgrade_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 2 additions & 0 deletions pkg/nodeupgrader/testdata/expected_rest_control_plane_upgrader_pod.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions pkg/nodeupgrader/upgrader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/nodeupgrader/upgrader_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Loading