5

Signed-off-by: dkarpele <[email protected]>

Author: dkarpele

test/ginkgo/fixture/fixture.go

@@ -337,7 +337,9 @@ func deleteNamespaceAndVerify(ctx context.Context, namespaceParam string, k8sCli
 	// Delete the namespace:
 	// - Issue a request to Delete the namespace
 	// - Finally, we check if it has been deleted.
-	if err := wait.PollUntilContextTimeout(ctx, time.Second*5, time.Minute*6, true, func(ctx context.Context) (done bool, err error) {
+	// Using 10 minute timeout to accommodate CI environments with limited resources
+	// where cleanup operations may take longer due to finalizers on ArgoCD resources.
+	if err := wait.PollUntilContextTimeout(ctx, time.Second*5, time.Minute*10, true, func(ctx context.Context) (done bool, err error) {
 		// Delete the namespace, if it exists
 		namespace := corev1.Namespace{
 			ObjectMeta: metav1.ObjectMeta{

test/ginkgo/fixture/utils/fixtureUtils.go

@@ -125,5 +125,12 @@ func getSystemKubeConfig() (*rest.Config, error) {
 	if err != nil {
 		return nil, err
 	}
+
+	// Increase QPS and Burst to avoid rate limiting issues during cleanup.
+	// The default values (5 QPS, 10 Burst) can cause "client rate limiter Wait returned an error"
+	// errors in CI environments with limited resources where cleanup operations are slower.
+	restConfig.QPS = 50
+	restConfig.Burst = 100
+
 	return restConfig, nil
 }

test/ginkgo/parallel/1-001_validate_image_updater_test.go

@@ -50,6 +50,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			ns           *corev1.Namespace
 			cleanupFunc  func()
 			imageUpdater *imageUpdaterApi.ImageUpdater
+			argoCD       *argov1beta1api.ArgoCD
 		)
 
 		BeforeEach(func() {
@@ -63,7 +64,16 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			if imageUpdater != nil {
 				By("deleting ImageUpdater CR")
 				Expect(k8sClient.Delete(ctx, imageUpdater)).To(Succeed())
-				Eventually(imageUpdater).Should(k8sFixture.NotExistByName())
+				Eventually(imageUpdater, "2m", "5s").Should(k8sFixture.NotExistByName())
+			}
+
+			// Delete the ArgoCD CR before namespace deletion to allow the operator
+			// to properly clean up all managed resources. This prevents finalizer
+			// issues and rate limiting during cleanup in CI environments.
+			if argoCD != nil {
+				By("deleting ArgoCD CR")
+				Expect(k8sClient.Delete(ctx, argoCD)).To(Succeed())
+				Eventually(argoCD, "5m", "10s").Should(k8sFixture.NotExistByName())
 			}
 
 			if cleanupFunc != nil {
@@ -79,7 +89,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			By("creating simple namespace-scoped Argo CD instance with image updater enabled")
 			ns, cleanupFunc = fixture.CreateRandomE2ETestNamespaceWithCleanupFunc()
 
-			argoCD := &argov1beta1api.ArgoCD{
+			argoCD = &argov1beta1api.ArgoCD{
 				ObjectMeta: metav1.ObjectMeta{Name: "argocd", Namespace: ns.Name},
 				Spec: argov1beta1api.ArgoCDSpec{
 					ImageUpdater: argov1beta1api.ArgoCDImageUpdaterSpec{
@@ -181,8 +191,6 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 				// Return an empty string to signify the condition is not yet met.
 				return ""
 			}, "5m", "10s").Should(Equal("quay.io/dkarpele/my-guestbook:29437546.0"))
-
-			Expect(k8sClient.Delete(ctx, imageUpdater)).To(Succeed())
 		})
 	})
 })