Fixes for vSAN Stretch TKG (#3717)

Author: sipriyaa

tests/e2e/gc_metadata_syncer.go

@@ -723,7 +723,7 @@ var _ = ginkgo.Describe("[csi-guest] pvCSI metadata syncer tests", func() {
 	// 10. Verify CnsVolumeMetadata CRD in SV are updated.
 	// 11. Wait for labels to be deleted in CNS.
 	// 12. Delete PVC.
-	ginkgo.It("[ef-vks][ef-vks-n1][ef-vks-n2] Validate PV and PVC labels are updated/deleted "+
+	ginkgo.It("Validate PV and PVC labels are updated/deleted "+
 		"on CNS", ginkgo.Label(p0, block, tkg, vc70), func() {
 		var err error
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/policy_driven_vol_allocation.go

@@ -64,7 +64,7 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		lztVsandPvcName     = "pvc-vsand-lzt-"
 		eztVsandPodName     = "pod-vsand-ezt-"
 		lztVsandPodName     = "pod-vsand-lzt-"
-		resourceQuotaLimit  = "300Gi"
+		resourceQuotaLimit  = "500Gi"
 		svcMasterIp         string
 		sshWcpConfig        *ssh.ClientConfig
 		svcNamespace        string
@@ -1159,8 +1159,8 @@ var _ = ginkgo.Describe("[vol-allocation] Policy driven volume space allocation
 		12	Deleted the SPBM policy created in step 1
 	*/
 	ginkgo.It("[ef-f-vanilla-block][ef-f-svc-volallowcation][csi-block-vanilla][csi-guest][csi-supervisor]"+
-		"[ef-f-vks-thickthin][csi-wcp-vsan-direct] Verify online LZT/EZT volume expansion of attached "+
-		"volumes with IO", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, stable,
+		"[csi-wcp-vsan-direct] Verify online LZT/EZT volume expansion of attached volumes "+
+		"with IO", ginkgo.Label(p0, vanilla, block, thickThin, wcp, tkg, stable,
 		vsanDirect, vc70), func() {
 
 		ctx, cancel := context.WithCancel(context.Background())

tests/e2e/vsan_stretched_cluster.go

@@ -357,7 +357,7 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		if guestCluster {
 			ginkgo.By("Check if csi pods are running fine after site failure in supervisor")
 			// Check if csi pods are running fine after site failure
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()),
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
 				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
@@ -566,7 +566,7 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		if guestCluster {
 			ginkgo.By("Check if csi pods are running fine after site failure in supervisor")
 			// Check if csi pods are running fine after site failure
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()),
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
 				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
@@ -917,7 +917,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		time.Sleep(pollTimeout * 2)
 		if guestCluster {
 			ginkgo.By("Check for csi pods to be in Ready state in supervisor")
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 
@@ -1075,7 +1076,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 
 		if guestCluster {
 			ginkgo.By("Check if csi pods are running fine after site failure in supervisor")
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 
@@ -1235,7 +1237,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 
 		time.Sleep(pollTimeout * 2)
 		if guestCluster {
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 		// Check if csi pods are running fine after site failure
@@ -1530,7 +1533,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		time.Sleep(pollTimeout)
 		ginkgo.By("Check if csi pods are running fine after site failure")
 		if guestCluster {
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 		err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
@@ -2203,7 +2207,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		time.Sleep(pollTimeout * 2)
 		if guestCluster {
 			ginkgo.By("Check if csi pods are running fine after site failurein supervisor")
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 
@@ -2392,7 +2397,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 		time.Sleep(2 * pollTimeout)
 		if guestCluster {
 			ginkgo.By("Check if csi pods are running fine after site failurein supervisor")
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 
@@ -2572,7 +2578,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 
 		ginkgo.By("Check if csi pods are running fine after witness failure")
 		if guestCluster {
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}
 
@@ -4031,7 +4038,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 			if guestCluster {
 				ginkgo.By("Check if csi pods are running fine after site failure in supervisor")
 				// Check if csi pods are running fine after site failure
-				err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+				err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+					time.Duration(pollTimeout))
 				gomega.Expect(err).NotTo(gomega.HaveOccurred())
 			}
 			// Check if csi pods are running fine after site failure
@@ -4951,7 +4959,8 @@ var _ = ginkgo.Describe("[vsan-stretch-vanilla] vsan stretched cluster tests", f
 
 		if guestCluster {
 			ginkgo.By("Check for nodes to be in Ready state in supervisor")
-			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, int(svcCsipods.Size()), time.Duration(pollTimeout))
+			err = fpod.WaitForPodsRunningReady(ctx, svcClient, csiNs, len(svcCsipods.Items),
+				time.Duration(pollTimeout))
 			gomega.Expect(err).NotTo(gomega.HaveOccurred())
 		}