Fix flaky NodePort e2e tests #152

Author: amuraru

controllers/tests/kafkacluster_controller_externalnodeport_test.go

@@ -18,6 +18,7 @@ package tests
 import (
 	"fmt"
 	"sync/atomic"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
@@ -98,6 +99,23 @@ var _ = Describe("KafkaClusterNodeportExternalAccess", Ordered, func() {
 		Expect(err).NotTo(HaveOccurred())
 		// deletes all nodeports in the test namespace, to ensure a clean sheet, as garbage collection does not work in envtest
 		Expect(deleteNodePorts(ctx, kafkaCluster)).Should(Succeed())
+
+		// Wait for services to be fully deleted to prevent port conflicts
+		Eventually(func() int {
+			var serviceList corev1.ServiceList
+			err := k8sClient.List(ctx, &serviceList, client.InNamespace(namespace))
+			if err != nil {
+				return -1
+			}
+			nodePortCount := 0
+			for _, service := range serviceList.Items {
+				if service.Spec.Type == corev1.ServiceTypeNodePort {
+					nodePortCount++
+				}
+			}
+			return nodePortCount
+		}, 30*time.Second, 100*time.Millisecond).Should(Equal(0), "NodePort services should be fully deleted")
+
 		kafkaCluster = nil
 	})
 

controllers/tests/suite_test.go

@@ -303,6 +303,11 @@ func GetNodePort(portAmount int32) int32 {
 			continue
 		}
 
+		// Ensure the port range doesn't cross into the high conflict zone
+		if port+portAmount >= 32025 && port <= 32035 {
+			continue
+		}
+
 		allAvailable := true
 		for i := int32(0); i <= portAmount; i++ {
 			if nodePorts[port+i] {