Add e2e tests for inplace k8s upgrade to 1.29 (#7599)

aws · Feb 16, 2024 · 65b661c · 65b661c
1 parent 5a93099
commit 65b661c
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml b/test/e2e/TINKERBELL_HARDWARE_COUNT.yaml
@@ -121,7 +121,7 @@ TestTinkerbellSingleNode128To129UbuntuManagementCPUpgradeAPI: 4
 TestTinkerbellKubernetes125UbuntuTo126InPlaceUpgrade_1CP_1Worker: 2
 TestTinkerbellKubernetes126UbuntuTo127InPlaceUpgrade_1CP_2Worker: 3
 TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker: 4
-TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_3CP_1Worker: 4
+TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker: 2
 TestTinkerbellKubernetes125UbuntuTo126SingleNodeInPlaceUpgrade: 1
 TestTinkerbellKubernetes126UbuntuTo127SingleNodeInPlaceUpgrade: 1
 TestTinkerbellKubernetes127UbuntuTo128SingleNodeInPlaceUpgrade: 1

diff --git a/test/e2e/tinkerbell_test.go b/test/e2e/tinkerbell_test.go
@@ -443,16 +443,16 @@ func TestTinkerbellKubernetes127UbuntuTo128InPlaceUpgrade_3CP_1Worker(t *testing
 	)
 }
 
-func TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_3CP_1Worker(t *testing.T) {
+func TestTinkerbellKubernetes128UbuntuTo129InPlaceUpgrade_1CP_1Worker(t *testing.T) {
 	provider := framework.NewTinkerbell(t)
 	test := framework.NewClusterE2ETest(
 		t,
 		provider,
 		framework.WithClusterFiller(api.WithKubernetesVersion(v1alpha1.Kube128)),
-		framework.WithClusterFiller(api.WithControlPlaneCount(3)),
+		framework.WithClusterFiller(api.WithControlPlaneCount(1)),
 		framework.WithClusterFiller(api.WithWorkerNodeCount(1)),
 		framework.WithClusterFiller(api.WithInPlaceUpgradeStrategy()),
-		framework.WithControlPlaneHardware(3),
+		framework.WithControlPlaneHardware(1),
 		framework.WithWorkerHardware(1),
 	).WithClusterConfig(
 		provider.WithKubeVersionAndOS(v1alpha1.Kube128, framework.Ubuntu2004, nil),

diff --git a/test/framework/tinkerbell.go b/test/framework/tinkerbell.go
@@ -379,6 +379,11 @@ func Ubuntu128ImageForWorker() api.TinkerbellFiller {
 	return imageForKubeVersionAndOS(anywherev1.Kube128, Ubuntu2004, workerIdentifier)
 }
 
+// Ubuntu129ImageForWorker represents an Ubuntu raw image corresponding to Kubernetes 1.29 and is set for worker machine config.
+func Ubuntu129ImageForWorker() api.TinkerbellFiller {
+	return imageForKubeVersionAndOS(anywherev1.Kube129, Ubuntu2004, workerIdentifier)
+}
+
 // Ubuntu2204Kubernetes126Image represents an Ubuntu 22.04 raw image corresponding to Kubernetes 1.26.
 func Ubuntu2204Kubernetes126Image() api.TinkerbellFiller {
 	return imageForKubeVersionAndOS(anywherev1.Kube126, Ubuntu2204, "")