minor fixes

deepakm-ntnx · Feb 5, 2024 · 2890a68 · 2890a68
1 parent 9c878ed
commit 2890a68
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/test/e2e/cluster_topology_scale_up_down_test.go b/test/e2e/cluster_topology_scale_up_down_test.go
@@ -78,6 +78,9 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 			WithName(clusterName),
 			WithKubernetesVersion(targetKubeVer),
 			WithMachineMemorySize(fromMachineMemorySizeGibStr),
+			WithMachineSystemDiskSize(fromMachineMemorySizeGibStr),
+			WithMachineVCPUSockets(fromMachineVCPUSockets),
+			WithMachineVCPUSPerSocket(fromMachineVCPUsPerSocket),
 			WithControlPlaneCount(1),
 			WithWorkerNodeCount(1),
 			WithControlPlaneMachineTemplateImage(targetImageName),
@@ -97,6 +100,9 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 			WithName(clusterName),
 			WithKubernetesVersion(targetKubeVer),
 			WithMachineMemorySize(toMachineMemorySizeGibStr),
+			WithMachineSystemDiskSize(toMachineMemorySizeGibStr),
+			WithMachineVCPUSockets(toMachineVCPUSockets),
+			WithMachineVCPUSPerSocket(toMachineVCPUsPerSocket),
 			WithControlPlaneCount(1),
 			WithWorkerNodeCount(1),
 			WithControlPlaneMachineTemplateImage(targetImageName),
@@ -148,7 +154,7 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		kube128 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_28")
 		kube128Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_28")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "3Gi", "40Gi", "40Gi", 2, 2, 1, 1)
+		scaleDownWorkflow(kube128, kube128Image, "4Gi", "3Gi", "40Gi", "40Gi", 2, 2, 1, 1)
 	})
 
 	It("Scale down a cluster with CP and Worker node machine memory size from 4Gi to 3Gi with Kube129", func() {
@@ -157,7 +163,7 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		Kube129 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_29")
 		Kube129Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_29")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "3Gi", "40Gi", "40Gi", 2, 2, 1, 1)
+		scaleDownWorkflow(Kube129, Kube129Image, "4Gi", "3Gi", "40Gi", "40Gi", 2, 2, 1, 1)
 	})
 
 	It("Scale down a cluster with CP and Worker node VCPUSockets from 3 to 2 with Kube127", func() {
@@ -175,7 +181,7 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		kube128 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_28")
 		kube128Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_28")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 2, 1, 1)
+		scaleDownWorkflow(kube128, kube128Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 2, 1, 1)
 	})
 
 	It("Scale down a cluster with CP and Worker node machine VCPUSockets from 3 to 2 with Kube129", func() {
@@ -184,7 +190,7 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		Kube129 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_29")
 		Kube129Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_29")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 2, 1, 1)
+		scaleDownWorkflow(Kube129, Kube129Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 2, 1, 1)
 	})
 
 	It("Scale down a cluster with CP and Worker node vcpu per socket from 2 to 1 with Kube127", func() {
@@ -202,7 +208,7 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		kube128 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_28")
 		kube128Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_28")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 3, 2, 1)
+		scaleDownWorkflow(kube128, kube128Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 3, 2, 1)
 	})
 
 	It("Scale down a cluster with CP and Worker node machine vcpu per socket from 2 to 1 with Kube129", func() {
@@ -211,8 +217,8 @@ var _ = Describe("When scaling down cluster with topology ", Label("clusterclass
 
 		Kube129 := testHelper.getVariableFromE2eConfig("KUBERNETES_VERSION_v1_29")
 		Kube129Image := testHelper.getVariableFromE2eConfig("NUTANIX_MACHINE_TEMPLATE_IMAGE_NAME_v1_29")
-		scaleDownWorkflow(kube127, kube127Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 3, 2, 1)
+		scaleDownWorkflow(Kube129, Kube129Image, "4Gi", "4Gi", "40Gi", "40Gi", 3, 3, 2, 1)
 	})
 
-	TODO add system disk tests
+	// TODO add system disk tests
 })