Skip to content

Commit bb336c7

Browse files
sipriyaasipriyaa
committed
new changes
1 parent d18886a commit bb336c7

File tree

1 file changed

+47
-48
lines changed

1 file changed

+47
-48
lines changed

‎tests/e2e/vm_service_vsan_stretch_cluster.go

Lines changed: 47 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@ import (
3636
"k8s.io/kubernetes/test/e2e/framework"
3737
fnodes "k8s.io/kubernetes/test/e2e/framework/node"
3838

39-
fpod "k8s.io/kubernetes/test/e2e/framework/pod"
4039
fpv "k8s.io/kubernetes/test/e2e/framework/pv"
4140
admissionapi "k8s.io/pod-security-admission/api"
4241
ctlrclient "sigs.k8s.io/controller-runtime/pkg/client"
@@ -237,8 +236,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
237236
gomega.Expect(err).NotTo(gomega.HaveOccurred())
238237
}
239238

240-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
241-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
239+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
240+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
242241

243242
ginkgo.By("Bring down the primary site")
244243
siteFailover(ctx, true)
@@ -262,10 +261,10 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
262261

263262
time.Sleep(5 * time.Minute)
264263
// Check if csi pods are running fine after site failure
265-
ginkgo.By("Check if csi pods are running fine after site failure")
266-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
267-
time.Duration(pollTimeout*2))
268-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
264+
// ginkgo.By("Check if csi pods are running fine after site failure")
265+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
266+
// time.Duration(pollTimeout*2))
267+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
269268

270269
ginkgo.By("Waiting for all claims to be in bound state")
271270
pvs, err = fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaimsList, pollTimeout)
@@ -375,8 +374,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
375374
gomega.Expect(err).NotTo(gomega.HaveOccurred())
376375
}
377376

378-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
379-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
377+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
378+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
380379

381380
ginkgo.By("Bring down the secondary site")
382381
siteFailover(ctx, false)
@@ -399,11 +398,11 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
399398
}
400399

401400
time.Sleep(5 * time.Minute)
402-
// Check if csi pods are running fine after site failure
403-
ginkgo.By("Check if csi pods are running fine after site failure")
404-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
405-
time.Duration(pollTimeout*2))
406-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
401+
// // Check if csi pods are running fine after site failure
402+
// ginkgo.By("Check if csi pods are running fine after site failure")
403+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
404+
// time.Duration(pollTimeout*2))
405+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
407406

408407
ginkgo.By("Waiting for all claims to be in bound state")
409408
pvs, err = fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaimsList, pollTimeout)
@@ -488,8 +487,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
488487
gomega.Expect(err).NotTo(gomega.HaveOccurred())
489488
}()
490489

491-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
492-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
490+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
491+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
493492

494493
ch := make(chan *vmopv1.VirtualMachine)
495494
var wg sync.WaitGroup
@@ -535,11 +534,11 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
535534
gomega.Expect(err).NotTo(gomega.HaveOccurred())
536535
}
537536

538-
// Check if csi pods are running fine after site failure
539-
ginkgo.By("Check if csi pods are running fine after site failure")
540-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
541-
time.Duration(pollTimeout*2))
542-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
537+
// // Check if csi pods are running fine after site failure
538+
// ginkgo.By("Check if csi pods are running fine after site failure")
539+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
540+
// time.Duration(pollTimeout*2))
541+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
543542

544543
ginkgo.By("Creates a loadbalancing service for ssh with each VM" +
545544
"and waits for VM IP to come up to come up and verify PVCs are accessible in the VM")
@@ -628,8 +627,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
628627
gomega.Expect(err).NotTo(gomega.HaveOccurred())
629628
}()
630629

631-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
632-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
630+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
631+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
633632

634633
ginkgo.By("Creating VM")
635634
vms := createVMServiceVmWithMultiplePvcs(
@@ -683,11 +682,11 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
683682
}
684683

685684
time.Sleep(5 * time.Minute)
686-
// Check if csi pods are running fine after site failure
687-
ginkgo.By("Check if csi pods are running fine after site failure")
688-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
689-
time.Duration(pollTimeout*2))
690-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
685+
// // Check if csi pods are running fine after site failure
686+
// ginkgo.By("Check if csi pods are running fine after site failure")
687+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
688+
// time.Duration(pollTimeout*2))
689+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
691690

692691
ginkgo.By("Waiting for all claims to be in bound state")
693692
pvs, err = fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaimsList, pollTimeout)
@@ -772,8 +771,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
772771
gomega.Expect(err).NotTo(gomega.HaveOccurred())
773772
}()
774773

775-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
776-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
774+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
775+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
777776

778777
ch := make(chan *vmopv1.VirtualMachine)
779778
var wg sync.WaitGroup
@@ -800,10 +799,10 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
800799
}
801800
time.Sleep(5 * time.Minute)
802801

803-
ginkgo.By("Check if csi pods are running fine after site recovery")
804-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
805-
time.Duration(pollTimeout*2))
806-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
802+
// ginkgo.By("Check if csi pods are running fine after site recovery")
803+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
804+
// time.Duration(pollTimeout*2))
805+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
807806

808807
ginkgo.By("Creates a loadbalancing service for ssh with each VM" +
809808
"and waits for VM IP to come up to come up and verify PVCs are accessible in the VM")
@@ -855,8 +854,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
855854
sc, err := client.StorageV1().StorageClasses().Get(ctx, storageClassName, metav1.GetOptions{})
856855
gomega.Expect(err).NotTo(gomega.HaveOccurred())
857856

858-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
859-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
857+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
858+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
860859

861860
ginkgo.By("Wait for k8s cluster to be healthy")
862861
if vanillaCluster {
@@ -876,11 +875,11 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
876875
}
877876
}()
878877

879-
// Check if csi pods are running fine after site failure
880-
ginkgo.By("Check if csi pods are running fine after site failure")
881-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
882-
time.Duration(pollTimeout*2))
883-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
878+
// // Check if csi pods are running fine after site failure
879+
// ginkgo.By("Check if csi pods are running fine after site failure")
880+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
881+
// time.Duration(pollTimeout*2))
882+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
884883

885884
ginkgo.By("Create multiple PVCs")
886885
pvclaimsList := createMultiplePVCsInParallel(ctx, client, namespace, sc, pvcCount, nil)
@@ -1041,8 +1040,8 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
10411040
pvs, err = fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaimsList, pollTimeout)
10421041
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10431042
}
1044-
csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
1045-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1043+
// csipods, err := client.CoreV1().Pods(csiNs).List(ctx, metav1.ListOptions{})
1044+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
10461045

10471046
// Cause a network failure on primary site
10481047
ginkgo.By("Isolate secondary site from witness and primary site")
@@ -1061,11 +1060,11 @@ var _ bool = ginkgo.Describe("[vsan-stretch-vmsvc] vm service with csi vol tests
10611060
gomega.Expect(err).NotTo(gomega.HaveOccurred())
10621061
}
10631062

1064-
// Check if csi pods are running fine after site failure
1065-
ginkgo.By("Check if csi pods are running fine after site failure")
1066-
err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
1067-
time.Duration(pollTimeout*2))
1068-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
1063+
// // Check if csi pods are running fine after site failure
1064+
// ginkgo.By("Check if csi pods are running fine after site failure")
1065+
// err = fpod.WaitForPodsRunningReady(ctx, client, csiNs, len(csipods.Items),
1066+
// time.Duration(pollTimeout*2))
1067+
// gomega.Expect(err).NotTo(gomega.HaveOccurred())
10691068

10701069
ginkgo.By("Waiting for all claims to be in bound state")
10711070
pvs, err = fpv.WaitForPVClaimBoundPhase(ctx, client, pvclaimsList, pollTimeout)

0 commit comments

Comments
 (0)