Skip to content

Commit 5a92268

Browse files
vrutkovsvrutkovs
committed
Fix cleanups
1 parent 08737cc commit 5a92268

File tree

1 file changed

+49
-62
lines changed

1 file changed

+49
-62
lines changed

‎test/e2e/vmdistributedcluster_test.go‎

Lines changed: 49 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -51,15 +51,10 @@ func createVMClusterAndEnsureOperational(ctx context.Context, k8sClient client.C
5151
Expect(k8sClient.Create(ctx, vmcluster)).To(Succeed())
5252
localVMCluster := vmcluster
5353
DeferCleanup(func() {
54-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, localVMCluster)).To(Succeed())
54+
Expect(finalize.SafeDelete(ctx, k8sClient, localVMCluster)).To(Succeed())
5555
Eventually(func() error {
56-
var fetchedVMCluster vmv1beta1.VMCluster
57-
err := k8sClient.Get(ctx, types.NamespacedName{Name: localVMCluster.Name, Namespace: ns}, &fetchedVMCluster)
58-
if k8serrors.IsNotFound(err) {
59-
return nil
60-
}
61-
return err
62-
}, eventualDeletionTimeout).Should(Succeed())
56+
return k8sClient.Get(ctx, types.NamespacedName{Name: localVMCluster.Name, Namespace: ns}, &vmv1beta1.VMCluster{})
57+
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
6358
})
6459
Eventually(func() error {
6560
return expectObjectStatusOperational(ctx, k8sClient, localVMCluster, types.NamespacedName{Name: localVMCluster.Name, Namespace: ns})
@@ -77,11 +72,11 @@ func updateVMUserTargetRefs(ctx context.Context, k8sClient client.Client, vmUser
7772
}
7873

7974
// cleanupVMClusters handles the deferred cleanup of VMCluster resources.
80-
func cleanupVMClusters(ctx context.Context, k8sClient client.Client, vmclusters []vmv1beta1.VMCluster, namespacedName types.NamespacedName) {
75+
func cleanupVMClusters(ctx context.Context, k8sClient client.Client, vmclusters []vmv1beta1.VMCluster) {
8176
for _, vmcluster := range vmclusters {
82-
finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmcluster)
77+
finalize.SafeDelete(ctx, k8sClient, &vmcluster)
8378
Eventually(func() error {
84-
return k8sClient.Get(ctx, namespacedName, &vmv1beta1.VMCluster{})
79+
return k8sClient.Get(ctx, types.NamespacedName{Name: vmcluster.Name, Namespace: vmcluster.Namespace}, &vmv1beta1.VMCluster{})
8580
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
8681
}
8782
}
@@ -184,44 +179,35 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
184179
}
185180

186181
afterEach := func() {
187-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmv1alpha1.VMDistributedCluster{
182+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmv1alpha1.VMDistributedCluster{
188183
ObjectMeta: metav1.ObjectMeta{
189184
Namespace: namespace,
190185
Name: namespacedName.Name,
191186
},
192187
})).To(Succeed(), "must delete vmdistributedcluster after test")
193188
Eventually(func() error {
194-
err := k8sClient.Get(ctx, types.NamespacedName{
195-
Name: namespacedName.Name,
196-
Namespace: namespace,
197-
}, &vmv1alpha1.VMDistributedCluster{})
198-
if k8serrors.IsNotFound(err) {
199-
return nil
200-
}
201-
return fmt.Errorf("want NotFound error, got: %w", err)
202-
}, eventualDeletionTimeout, 1).WithContext(ctx).Should(Succeed())
189+
return k8sClient.Get(ctx, types.NamespacedName{Name: namespacedName.Name, Namespace: namespace}, &vmv1beta1.VMCluster{})
190+
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
203191

204-
var vmUser vmv1beta1.VMUser
205192
for _, vmuserName := range validVMUserNames {
206-
err := k8sClient.Get(ctx, vmuserName, &vmUser)
207-
if k8serrors.IsNotFound(err) {
208-
continue
209-
}
210-
Expect(err).To(Succeed(), "must get vm-user after test")
211-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmUser)).To(Succeed(), "must delete vm-user after test")
193+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmv1beta1.VMUser{
194+
ObjectMeta: metav1.ObjectMeta{
195+
Namespace: vmuserName.Namespace,
196+
Name: vmuserName.Name,
197+
},
198+
})).To(Succeed(), "must delete vm-user after test")
212199
Eventually(func() error {
213200
return k8sClient.Get(ctx, vmuserName, &vmv1beta1.VMUser{})
214201
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
215202
}
216203

217-
// Clean up VMAgent
218-
// var vmAgent vmv1beta1.VMAgent
219-
// err := k8sClient.Get(ctx, validVMAgentName, &vmAgent)
220-
// if k8serrors.IsNotFound(err) {
221-
// return
222-
// }
223-
// Expect(err).To(Succeed(), "must get vm-agent after test")
224-
// Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmAgent)).To(Succeed(), "must delete vm-agent after test")
204+
// // Clean up VMAgent
205+
// Expect(finalize.SafeDelete(ctx, k8sClient, &vmv1beta1.VMAgent{
206+
// ObjectMeta: metav1.ObjectMeta{
207+
// Namespace: validVMAgentName.Namespace,
208+
// Name: validVMAgentName.Name,
209+
// },
210+
// })).To(Succeed(), "must delete vm-agent after test")
225211
// Eventually(func() error {
226212
// return k8sClient.Get(ctx, validVMAgentName, &vmv1beta1.VMAgent{})
227213
// }, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
@@ -230,18 +216,12 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
230216
Context("create", func() {
231217
DescribeTable("should create vmdistributedcluster with VMAgent", func(cr *vmv1alpha1.VMDistributedCluster, vmclusters []vmv1beta1.VMCluster, vmagents map[string]*vmv1beta1.VMAgent, verify func(cr *vmv1alpha1.VMDistributedCluster, createdVMClusters []vmv1beta1.VMCluster)) {
232218
beforeEach()
233-
DeferCleanup(func() {
234-
cleanupVMClusters(ctx, k8sClient, vmclusters, namespacedName)
235-
for _, vmagent := range vmagents {
236-
finalize.SafeDeleteWithFinalizer(ctx, k8sClient, vmagent)
237-
Eventually(func() error {
238-
return k8sClient.Get(ctx, namespacedName, &vmv1beta1.VMAgent{})
239-
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
240-
}
241-
afterEach()
242-
})
219+
DeferCleanup(afterEach)
243220

244221
createVMClustersAndUpdateTargetRefs(ctx, k8sClient, vmclusters, namespace, validVMUserNames)
222+
DeferCleanup(func() {
223+
cleanupVMClusters(ctx, k8sClient, vmclusters)
224+
})
245225

246226
// Create VMAgents
247227
for _, vmagent := range vmagents {
@@ -250,6 +230,14 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
250230
return expectObjectStatusOperational(ctx, k8sClient, &vmv1beta1.VMAgent{}, types.NamespacedName{Name: vmagent.Name, Namespace: vmagent.Namespace})
251231
}, eventualStatefulsetAppReadyTimeout).Should(Succeed())
252232
}
233+
DeferCleanup(func() {
234+
for _, vmagent := range vmagents {
235+
finalize.SafeDelete(ctx, k8sClient, vmagent)
236+
Eventually(func() error {
237+
return k8sClient.Get(ctx, types.NamespacedName{Name: vmagent.Name, Namespace: vmagent.Namespace}, &vmv1beta1.VMAgent{})
238+
}, eventualDeletionTimeout).Should(MatchError(k8serrors.IsNotFound, "IsNotFound"))
239+
}
240+
})
253241

254242
namespacedName.Name = cr.Name
255243
Expect(k8sClient.Create(ctx, cr)).To(Succeed())
@@ -526,8 +514,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
526514
}
527515
vmclusters := []vmv1beta1.VMCluster{*vmCluster1, *vmCluster2}
528516
DeferCleanup(func() {
529-
cleanupVMClusters(ctx, k8sClient, vmclusters, namespacedName)
530-
afterEach()
517+
cleanupVMClusters(ctx, k8sClient, vmclusters)
531518
})
532519

533520
createVMClustersAndUpdateTargetRefs(ctx, k8sClient, vmclusters, namespace, validVMUserNames)
@@ -556,7 +543,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
556543
}
557544
Expect(k8sClient.Create(ctx, cr)).To(Succeed())
558545
DeferCleanup(func() {
559-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, cr)).To(Succeed())
546+
Expect(finalize.SafeDelete(ctx, k8sClient, cr)).To(Succeed())
560547
})
561548
Eventually(func() error {
562549
return expectObjectStatusOperational(ctx, k8sClient, &vmv1alpha1.VMDistributedCluster{}, namespacedName)
@@ -646,8 +633,8 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
646633
},
647634
}
648635
DeferCleanup(func() {
649-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &pausedVMUser)).To(Succeed())
650-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, vmCluster)).To(Succeed())
636+
Expect(finalize.SafeDelete(ctx, k8sClient, &pausedVMUser)).To(Succeed())
637+
Expect(finalize.SafeDelete(ctx, k8sClient, vmCluster)).To(Succeed())
651638
})
652639
Expect(k8sClient.Create(ctx, &pausedVMUser)).To(Succeed(), "must create managed vm-user before test")
653640
createVMClusterAndEnsureOperational(ctx, k8sClient, vmCluster, namespace)
@@ -764,7 +751,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
764751
vmclusters := []vmv1beta1.VMCluster{*vmCluster1, *vmCluster2}
765752
DeferCleanup(func() {
766753
for _, vmcluster := range vmclusters {
767-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmcluster)).To(Succeed())
754+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmcluster)).To(Succeed())
768755
}
769756
})
770757

@@ -808,7 +795,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
808795
}
809796
DeferCleanup(func() {
810797
for _, vmagent := range vmAgents {
811-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmagent)).To(Succeed())
798+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmagent)).To(Succeed())
812799
}
813800
})
814801

@@ -933,7 +920,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
933920
}, eventualStatefulsetAppReadyTimeout).WithContext(ctx).Should(Succeed())
934921
verifyOwnerReferences(ctx, cr, inlineVMClusters, namespace)
935922
DeferCleanup(func() {
936-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, cr)).To(Succeed())
923+
Expect(finalize.SafeDelete(ctx, k8sClient, cr)).To(Succeed())
937924
})
938925

939926
By("updating the VMUser to target the inline VMClusters")
@@ -959,7 +946,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
959946
}
960947
Expect(k8sClient.Update(ctx, &vmUser)).To(Succeed())
961948
DeferCleanup(func() {
962-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmUser)).To(Succeed())
949+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmUser)).To(Succeed())
963950
})
964951

965952
By("waiting for VMDistributedCluster to become operational")
@@ -989,8 +976,8 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
989976
Expect(actualReplicaCount).To(Equal(int32(2)))
990977

991978
DeferCleanup(func() {
992-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmCluster1)).To(Succeed())
993-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, &vmCluster2)).To(Succeed())
979+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmCluster1)).To(Succeed())
980+
Expect(finalize.SafeDelete(ctx, k8sClient, &vmCluster2)).To(Succeed())
994981
})
995982
})
996983

@@ -1015,7 +1002,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
10151002
}
10161003
Expect(k8sClient.Create(ctx, initialCluster)).To(Succeed())
10171004
DeferCleanup(func() {
1018-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, initialCluster)).To(Succeed())
1005+
Expect(finalize.SafeDelete(ctx, k8sClient, initialCluster)).To(Succeed())
10191006
})
10201007
Eventually(func() error {
10211008
return expectObjectStatusOperational(ctx, k8sClient, initialCluster, types.NamespacedName{Name: initialCluster.Name, Namespace: namespace})
@@ -1060,7 +1047,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
10601047
}
10611048
Expect(k8sClient.Create(ctx, cr)).To(Succeed())
10621049
DeferCleanup(func() {
1063-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, cr)).To(Succeed())
1050+
Expect(finalize.SafeDelete(ctx, k8sClient, cr)).To(Succeed())
10641051
})
10651052

10661053
By("waiting for VMDistributedCluster to become operational")
@@ -1080,7 +1067,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
10801067
DescribeTable("should fail when creating vmdistributedcluster", func(cr *vmv1alpha1.VMDistributedCluster, vmclusters []vmv1beta1.VMCluster) {
10811068
beforeEach()
10821069
DeferCleanup(func() {
1083-
cleanupVMClusters(ctx, k8sClient, vmclusters, namespacedName)
1070+
cleanupVMClusters(ctx, k8sClient, vmclusters)
10841071
afterEach()
10851072
})
10861073
for _, vmcluster := range vmclusters {
@@ -1423,7 +1410,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
14231410
vmclusters := []vmv1beta1.VMCluster{*vmCluster}
14241411

14251412
DeferCleanup(func() {
1426-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, vmCluster)).To(Succeed())
1413+
Expect(finalize.SafeDelete(ctx, k8sClient, vmCluster)).To(Succeed())
14271414
})
14281415
createVMClustersAndUpdateTargetRefs(ctx, k8sClient, vmclusters, namespace, validVMUserNames)
14291416

@@ -1451,7 +1438,7 @@ var _ = Describe("e2e vmdistributedcluster", Label("vm", "vmdistributedcluster")
14511438
return expectObjectStatusOperational(ctx, k8sClient, &vmv1alpha1.VMDistributedCluster{}, types.NamespacedName{Name: namespacedName.Name, Namespace: namespace})
14521439
}, eventualStatefulsetAppReadyTimeout).WithContext(ctx).Should(Succeed())
14531440

1454-
Expect(finalize.SafeDeleteWithFinalizer(ctx, k8sClient, cr)).To(Succeed())
1441+
Expect(finalize.SafeDelete(ctx, k8sClient, cr)).To(Succeed())
14551442
Eventually(func() error {
14561443
err := k8sClient.Get(ctx, namespacedName, &vmv1alpha1.VMDistributedCluster{})
14571444
if k8serrors.IsNotFound(err) {

0 commit comments

Comments
 (0)