Skip to content

Commit c46d2dd

Browse files
sipriyaasipriyaa
committed
fixing namespace listing in supervisor cluster
1 parent 393ed34 commit c46d2dd

File tree

2 files changed

+58
-52
lines changed

2 files changed

+58
-52
lines changed

‎tests/e2e/mgmt_wrkld_domain_isolation.go

Lines changed: 43 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
240240
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
241241
}()
242242

243+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
244+
time.Sleep(2 * time.Minute)
245+
243246
ginkgo.By("Read zonal-2 storage policy tagged to wcp namespace")
244247
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
245248
if !apierrors.IsNotFound(err) {
@@ -319,6 +322,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
319322
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
320323
}()
321324

325+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
326+
time.Sleep(2 * time.Minute)
327+
322328
ginkgo.By("Fetch zone-1 storage policy tagged to wcp namespace")
323329
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
324330
if !apierrors.IsNotFound(err) {
@@ -396,6 +402,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
396402
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
397403
}()
398404

405+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
406+
time.Sleep(2 * time.Minute)
407+
399408
ginkgo.By("Fetch zone-2 storage policy tagged to wcp namespace")
400409
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyNameWffc, metav1.GetOptions{})
401410
if !apierrors.IsNotFound(err) {
@@ -467,11 +476,11 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
467476
gomega.Expect(err).NotTo(gomega.HaveOccurred())
468477

469478
/*
470-
EX - zone -> zone-1, zone-2, zone-3, zone-4, zone-5
479+
EX - zone -> zone-1, zone-2, zone-3, zone-4
471480
so topValStartIndex=1 and topValEndIndex=3 will fetch the 2nd and 3rd index from topology map string
472481
*/
473482
topValStartIndex := 0
474-
topValEndIndex := 5
483+
topValEndIndex := 4
475484

476485
ginkgo.By("Fetching allowed topology assigned to all zones")
477486
allowedTopologies = setSpecificAllowedTopology(allowedTopologies, topkeyStartIndex, topValStartIndex,
@@ -488,6 +497,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
488497
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
489498
}()
490499

500+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
501+
time.Sleep(2 * time.Minute)
502+
491503
ginkgo.By("Fetch shared storage policy tagged to wcp namespace")
492504
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
493505
if !apierrors.IsNotFound(err) {
@@ -499,24 +511,13 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
499511
diskSize, storageclass, true)
500512
gomega.Expect(err).NotTo(gomega.HaveOccurred())
501513
volHandle := persistentVolumes[0].Spec.CSI.VolumeHandle
502-
defer func() {
503-
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim.Name, namespace)
504-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
505-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volHandle)
506-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
507-
}()
508514

509515
ginkgo.By("Creating a Deployment using pvc")
510516
dep, err := createDeployment(ctx, client, 1, labelsMap, nil, namespace,
511517
[]*v1.PersistentVolumeClaim{pvclaim}, execRWXCommandPod1, false, busyBoxImageOnGcr)
512518
gomega.Expect(err).NotTo(gomega.HaveOccurred())
513519
podList, err := fdep.GetPodsForDeployment(ctx, client, dep)
514520
gomega.Expect(err).NotTo(gomega.HaveOccurred())
515-
defer func() {
516-
ginkgo.By("Delete Deployment")
517-
err := client.AppsV1().Deployments(namespace).Delete(ctx, dep.Name, metav1.DeleteOptions{})
518-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
519-
}()
520521

521522
ginkgo.By("Verify the volume is accessible and Read/write is possible")
522523
output := readFileFromPod(namespace, podList.Items[0].Name, filePathPod1)
@@ -531,17 +532,11 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
531532
gomega.Expect(strings.Contains(output2, "Hello message from Pod1")).NotTo(gomega.BeFalse())
532533

533534
ginkgo.By("Creating service")
534-
service := CreateService(namespace, client)
535-
defer func() {
536-
deleteService(namespace, client, service)
537-
}()
535+
_ = CreateService(namespace, client)
538536

539537
ginkgo.By("Creating statefulset")
540538
statefulset := createCustomisedStatefulSets(ctx, client, namespace, true, replicas, false, nil,
541539
false, true, "", "", storageclass, storageclass.Name)
542-
defer func() {
543-
fss.DeleteAllStatefulSets(ctx, client, namespace)
544-
}()
545540

546541
ginkgo.By("Verify svc pv affinity, pvc annotation and pod node affinity")
547542
err = verifyPvcAnnotationPvAffinityPodAnnotationInSvc(ctx, client, statefulset, nil, dep, namespace,
@@ -569,46 +564,19 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
569564
gomega.Expect(err).NotTo(gomega.HaveOccurred())
570565

571566
ginkgo.By("Create a dynamic volume snapshot")
572-
volumeSnapshot, snapshotContent, snapshotCreated,
573-
snapshotContentCreated, snapshotId, _, err := createDynamicVolumeSnapshot(ctx, namespace, snapc,
567+
volumeSnapshot, _, _,
568+
_, snapshotId, _, err := createDynamicVolumeSnapshot(ctx, namespace, snapc,
574569
volumeSnapshotClass, pvclaim, volHandle, diskSize, true)
575570
gomega.Expect(err).NotTo(gomega.HaveOccurred())
576-
defer func() {
577-
if snapshotContentCreated {
578-
err = deleteVolumeSnapshotContent(ctx, snapshotContent, snapc, pandoraSyncWaitTime)
579-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
580-
}
581-
582-
if snapshotCreated {
583-
framework.Logf("Deleting volume snapshot")
584-
deleteVolumeSnapshotWithPandoraWait(ctx, snapc, namespace, volumeSnapshot.Name, pandoraSyncWaitTime)
585-
586-
framework.Logf("Wait till the volume snapshot is deleted")
587-
err = waitForVolumeSnapshotContentToBeDeletedWithPandoraWait(ctx, snapc,
588-
*volumeSnapshot.Status.BoundVolumeSnapshotContentName, pandoraSyncWaitTime)
589-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
590-
}
591-
}()
592571

593572
ginkgo.By("Mark zone-2 for removal from wcp namespace")
594573
err = markZoneForRemovalFromWcpNs(vcRestSessionId, namespace,
595574
topologyAffinityDetails[topologyCategories[0]][1]) // this will fetch zone-2
596575
gomega.Expect(err).NotTo(gomega.HaveOccurred())
597576

598577
ginkgo.By("Restore a volume snapshot")
599-
pvclaim2, pvs2, pod2 := verifyVolumeRestoreOperation(ctx, client, namespace, storageclass,
578+
_, _, pod2 := verifyVolumeRestoreOperation(ctx, client, namespace, storageclass,
600579
volumeSnapshot, diskSize, true)
601-
volHandle2 := pvs2[0].Spec.CSI.VolumeHandle
602-
defer func() {
603-
ginkgo.By(fmt.Sprintf("Deleting the pod %s in namespace %s", pod2.Name, namespace))
604-
err = fpod.DeletePodWithWait(ctx, client, pod2)
605-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
606-
607-
err := fpv.DeletePersistentVolumeClaim(ctx, client, pvclaim2.Name, namespace)
608-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
609-
err = e2eVSphere.waitForCNSVolumeToBeDeleted(volHandle2)
610-
gomega.Expect(err).NotTo(gomega.HaveOccurred())
611-
}()
612580

613581
ginkgo.By("Perform scaling operation on statefulset. Increase the replica count to 9 when zone is marked" +
614582
" for removal")
@@ -622,7 +590,7 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
622590
gomega.Expect(err).NotTo(gomega.HaveOccurred())
623591

624592
ginkgo.By("Delete dynamic volume snapshot")
625-
snapshotCreated, snapshotContentCreated, err = deleteVolumeSnapshot(ctx, snapc, namespace,
593+
_, _, err = deleteVolumeSnapshot(ctx, snapc, namespace,
626594
volumeSnapshot, pandoraSyncWaitTime, volHandle, snapshotId, true)
627595
gomega.Expect(err).NotTo(gomega.HaveOccurred())
628596
})
@@ -665,6 +633,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
665633
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
666634
}()
667635

636+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
637+
time.Sleep(2 * time.Minute)
638+
668639
ginkgo.By("Read shared storage policy tagged to wcp namespace")
669640
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, sharedStoragePolicyName, metav1.GetOptions{})
670641
if !apierrors.IsNotFound(err) {
@@ -737,6 +708,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
737708
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
738709
}()
739710

711+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
712+
time.Sleep(2 * time.Minute)
713+
740714
ginkgo.By("Read shared storage policy tagged to wcp namespace")
741715
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, sharedStoragePolicyName, metav1.GetOptions{})
742716
if !apierrors.IsNotFound(err) {
@@ -854,6 +828,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
854828
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
855829
}()
856830

831+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
832+
time.Sleep(2 * time.Minute)
833+
857834
ginkgo.By("Read zonal storage policy of zone3")
858835
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, zonalStoragePolicyZone3, metav1.GetOptions{})
859836
if !apierrors.IsNotFound(err) {
@@ -930,6 +907,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
930907
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
931908
}()
932909

910+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
911+
time.Sleep(2 * time.Minute)
912+
933913
ginkgo.By("Fetch storage class tagged to wcp namespace")
934914
storageClassNames := []string{sharedStoragePolicyName, storagePolicyNameZ1, storagePolicyNameZ2}
935915
storageClasses := make([]*storagev1.StorageClass, len(storageClassNames))
@@ -1153,6 +1133,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
11531133
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
11541134
}()
11551135

1136+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
1137+
time.Sleep(2 * time.Minute)
1138+
11561139
storageClassNames := []string{storagePolicyNameZ1, sharedStoragePolicyName}
11571140
storageClasses := make([]*storagev1.StorageClass, len(storageClassNames))
11581141
for i, name := range storageClassNames {
@@ -1307,6 +1290,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
13071290
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
13081291
}()
13091292

1293+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
1294+
time.Sleep(2 * time.Minute)
1295+
13101296
// Create PVCs
13111297
ginkgo.By("Create 2 PVCs with different binding modes")
13121298
storageClassList := []*storagev1.StorageClass{zonalStorageClass, sharedStorageClass}
@@ -1339,7 +1325,6 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
13391325
deployments := []*appsv1.Deployment{}
13401326
depSpecs := [][]*v1.PersistentVolumeClaim{
13411327
{pvcList[0], pvcList[1]},
1342-
{pvcList[2]},
13431328
}
13441329
for _, pvcSet := range depSpecs {
13451330
dep, err := createDeployment(ctx, client, 1, labelsMap, nil, namespace,
@@ -1524,6 +1509,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
15241509
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
15251510
}()
15261511

1512+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
1513+
time.Sleep(2 * time.Minute)
1514+
15271515
ginkgo.By("Create static volume")
15281516
_, _, staticPvc, staticPv, err := createStaticVolumeOnSvc(ctx, client,
15291517
namespace, storageDatastoreUrlZone2, storagePolicyName)
@@ -1645,6 +1633,9 @@ var _ bool = ginkgo.Describe("[domain-isolation] Management-Workload-Domain-Isol
16451633
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
16461634
}()
16471635

1636+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
1637+
time.Sleep(2 * time.Minute)
1638+
16481639
ginkgo.By("Read zonal class")
16491640
storageclassImm, err := client.StorageV1().StorageClasses().Get(ctx, zonalPolicy, metav1.GetOptions{})
16501641
if !apierrors.IsNotFound(err) {

‎tests/e2e/mgmt_wrkld_domain_isolation_vmservice.go

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -219,6 +219,9 @@ var _ bool = ginkgo.Describe("[domain-isolation-vmsvc] Domain-Isolation-VmServic
219219
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
220220
}()
221221

222+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
223+
time.Sleep(2 * time.Minute)
224+
222225
ginkgo.By("Read zonal-2 storage policy which is tagged to wcp namespace")
223226
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyNameZone2, metav1.GetOptions{})
224227
if !apierrors.IsNotFound(err) {
@@ -327,6 +330,9 @@ var _ bool = ginkgo.Describe("[domain-isolation-vmsvc] Domain-Isolation-VmServic
327330
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
328331
}()
329332

333+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
334+
time.Sleep(2 * time.Minute)
335+
330336
ginkgo.By("Read shared storage policy which is tagged to wcp namespace")
331337
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyNameZone24, metav1.GetOptions{})
332338
if !apierrors.IsNotFound(err) {
@@ -441,6 +447,9 @@ var _ bool = ginkgo.Describe("[domain-isolation-vmsvc] Domain-Isolation-VmServic
441447
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
442448
}()
443449

450+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
451+
time.Sleep(2 * time.Minute)
452+
444453
ginkgo.By("Read shared storage policy which is tagged to wcp namespace")
445454
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
446455
if !apierrors.IsNotFound(err) {
@@ -600,6 +609,9 @@ var _ bool = ginkgo.Describe("[domain-isolation-vmsvc] Domain-Isolation-VmServic
600609
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
601610
}()
602611

612+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
613+
time.Sleep(2 * time.Minute)
614+
603615
ginkgo.By("Read shared storage policy which is tagged to wcp namespace")
604616
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
605617
if !apierrors.IsNotFound(err) {
@@ -785,6 +797,9 @@ var _ bool = ginkgo.Describe("[domain-isolation-vmsvc] Domain-Isolation-VmServic
785797
gomega.Expect(waitForNamespaceToGetDeleted(ctx, client, namespace, poll, pollTimeout)).To(gomega.Succeed())
786798
}()
787799

800+
ginkgo.By("Wait for namespace to get listed under supervisor cluster")
801+
time.Sleep(2 * time.Minute)
802+
788803
ginkgo.By("Read shared storage policy which is tagged to wcp namespace")
789804
storageclass, err := client.StorageV1().StorageClasses().Get(ctx, storagePolicyName, metav1.GetOptions{})
790805
if !apierrors.IsNotFound(err) {

0 commit comments

Comments
 (0)