tests: Ensure all dnsrecords are removed in cleanup

Ensures all DNSrecord resources in the current spec test namespace are marked for deletion and removed before removing the secret. Signed-off-by: Michael Nairn <[email protected]>
Kuadrant · Oct 15, 2024 · 1744472 · 1744472
1 parent d11ed02
commit 1744472
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 14 deletions.
diff --git a/tests/common/dnspolicy/dnspolicy_controller_single_cluster_test.go b/tests/common/dnspolicy/dnspolicy_controller_single_cluster_test.go
@@ -115,15 +115,24 @@ var _ = Describe("DNSPolicy Single Cluster", func() {
 		if dnsPolicy != nil {
 			err := k8sClient.Delete(ctx, dnsPolicy)
 			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())
-			// Wait until dns records are finished deleting since it can't finish deleting without the DNS provider secret
-			Eventually(func(g Gomega) {
-				dnsRecords := &kuadrantdnsv1alpha1.DNSRecordList{}
-				err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
-				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(dnsRecords.Items).To(HaveLen(0))
-			}).WithContext(ctx).Should(Succeed())
+		}
 
+		//Ensure all dns records in the test namespace are deleted
+		dnsRecords := &kuadrantdnsv1alpha1.DNSRecordList{}
+		err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
+		Expect(err).ToNot(HaveOccurred())
+		for _, record := range dnsRecords.Items {
+			err := k8sClient.Delete(ctx, &record, client.PropagationPolicy(metav1.DeletePropagationForeground))
+			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())
 		}
+
+		// Wait until dns records are finished deleting since it can't finish deleting without the DNS provider secret
+		Eventually(func(g Gomega) {
+			err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
+			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(dnsRecords.Items).To(HaveLen(0))
+		}).WithContext(ctx).Should(Succeed())
+
 		if dnsProviderSecret != nil {
 			err := k8sClient.Delete(ctx, dnsProviderSecret)
 			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())

diff --git a/tests/common/dnspolicy/dnspolicy_controller_test.go b/tests/common/dnspolicy/dnspolicy_controller_test.go
@@ -59,14 +59,24 @@ var _ = Describe("DNSPolicy controller", func() {
 		if dnsPolicy != nil {
 			err := k8sClient.Delete(ctx, dnsPolicy)
 			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())
-			// Wait until dns records are finished deleting since it can't finish deleting without the DNS provider secret
-			Eventually(func(g Gomega) {
-				dnsRecords := &kuadrantdnsv1alpha1.DNSRecordList{}
-				err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
-				g.Expect(err).NotTo(HaveOccurred())
-				g.Expect(dnsRecords.Items).To(HaveLen(0))
-			}).WithContext(ctx).Should(Succeed())
 		}
+
+		//Ensure all dns records in the test namespace are deleted
+		dnsRecords := &kuadrantdnsv1alpha1.DNSRecordList{}
+		err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
+		Expect(err).ToNot(HaveOccurred())
+		for _, record := range dnsRecords.Items {
+			err := k8sClient.Delete(ctx, &record, client.PropagationPolicy(metav1.DeletePropagationForeground))
+			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())
+		}
+
+		// Wait until dns records are finished deleting since it can't finish deleting without the DNS provider secret
+		Eventually(func(g Gomega) {
+			err := k8sClient.List(ctx, dnsRecords, client.InNamespace(testNamespace))
+			g.Expect(err).NotTo(HaveOccurred())
+			g.Expect(dnsRecords.Items).To(HaveLen(0))
+		}).WithContext(ctx).Should(Succeed())
+
 		if dnsProviderSecret != nil {
 			err := k8sClient.Delete(ctx, dnsProviderSecret)
 			Expect(client.IgnoreNotFound(err)).ToNot(HaveOccurred())