refactor: E2E tests to support parallel tests

.github/workflows/apisix-e2e-test.yml

@@ -73,6 +73,12 @@ jobs:
         with:
           go-version: "1.23"
 
+      - name: Install ginkgo
+        run: |
+            GINKGO_VERSION=$(cd test/e2e && go list -m  -mod=readonly  -f {{.Version}}  github.com/onsi/ginkgo/v2)
+            go install github.com/onsi/ginkgo/v2/ginkgo@$GINKGO_VERSION
+            sudo cp ~/go/bin/ginkgo /usr/local/bin
+
       - name: Build images
         env:
           TAG: dev
@@ -111,4 +117,4 @@ jobs:
           PROVIDER_TYPE: ${{ matrix.provider_type }}
           TEST_LABEL: ${{ matrix.cases_subset }}
         run: |
-          make e2e-test
+          make ginkgo-e2e-test

test/e2e/crds/v1alpha1/backendtrafficpolicy.go

@@ -19,15 +19,22 @@ package v1alpha1
 
 import (
 	"fmt"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
 var _ = Describe("Test BackendTrafficPolicy base on HTTPRoute", Label("apisix.apache.org", "v1alpha1", "backendtrafficpolicy"), func() {
-	s := scaffold.NewDefaultScaffold()
+	var (
+		s = scaffold.NewScaffold(&scaffold.Options{
+			ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
+		})
+		err error
+	)
 
 	var defaultGatewayProxy = `
 apiVersion: apisix.apache.org/v1alpha1
@@ -59,7 +66,7 @@ spec:
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: apisix
+  name: %s
 spec:
   gatewayClassName: %s
   listeners:
@@ -80,7 +87,7 @@ metadata:
   name: httpbin
 spec:
   parentRefs:
-  - name: apisix
+  - name: %s
   hostnames:
   - "httpbin.org"
   rules:
@@ -125,7 +132,25 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 		It("should rewrite upstream host", func() {
 			s.ResourceApplied("BackendTrafficPolicy", "httpbin", createUpstreamHost, 1)

test/e2e/crds/v1alpha1/consumer.go

@@ -19,15 +19,22 @@ package v1alpha1
 
 import (
 	"fmt"
+	"time"
 
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
+	"k8s.io/apimachinery/pkg/types"
 
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
 var _ = Describe("Test Consumer", Label("apisix.apache.org", "v1alpha1", "consumer"), func() {
-	s := scaffold.NewDefaultScaffold()
+	var (
+		s = scaffold.NewScaffold(&scaffold.Options{
+			ControllerName: fmt.Sprintf("apisix.apache.org/apisix-ingress-controller-%d", time.Now().Unix()),
+		})
+		err error
+	)
 
 	var defaultGatewayProxy = `
 apiVersion: apisix.apache.org/v1alpha1
@@ -59,7 +66,7 @@ spec:
 apiVersion: gateway.networking.k8s.io/v1
 kind: Gateway
 metadata:
-  name: apisix
+  name: %s
 spec:
   gatewayClassName: %s
   listeners:
@@ -94,7 +101,7 @@ metadata:
   name: httpbin
 spec:
   parentRefs:
-  - name: apisix
+  - name: %s
   hostnames:
   - "httpbin.org"
   rules:
@@ -121,7 +128,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: key-auth
       name: key-auth-sample
@@ -143,7 +150,7 @@ metadata:
   name: consumer-sample2
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: key-auth
       name: key-auth-sample
@@ -152,12 +159,30 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 
 		It("limit-count plugin", func() {
-			s.ResourceApplied("Consumer", "consumer-sample", limitCountConsumer, 1)
-			s.ResourceApplied("Consumer", "consumer-sample2", unlimitConsumer, 1)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(limitCountConsumer, s.Namespace()), 1)
+			s.ResourceApplied("Consumer", "consumer-sample2", fmt.Sprintf(unlimitConsumer, s.Namespace()), 1)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",
@@ -212,7 +237,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: basic-auth
       name: basic-auth-sample
@@ -234,7 +259,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: basic-auth
       name: basic-auth-sample
@@ -248,11 +273,29 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 
 		It("Create/Update/Delete", func() {
-			s.ResourceApplied("Consumer", "consumer-sample", defaultCredential, 1)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(defaultCredential, s.Namespace()), 1)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",
@@ -286,7 +329,7 @@ spec:
 			})
 
 			By("update Consumer")
-			s.ResourceApplied("Consumer", "consumer-sample", updateCredential, 2)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(updateCredential, s.Namespace()), 2)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",
@@ -330,7 +373,7 @@ spec:
 			})
 
 			By("delete Consumer")
-			err := s.DeleteResourceFromString(updateCredential)
+			err := s.DeleteResourceFromString(fmt.Sprintf(updateCredential, s.Namespace()))
 			Expect(err).NotTo(HaveOccurred(), "deleting Consumer")
 
 			s.RequestAssert(&scaffold.RequestAssert{
@@ -380,7 +423,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: basic-auth
       name: basic-auth-sample
@@ -397,14 +440,32 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 		It("Create/Update/Delete", func() {
 			err := s.CreateResourceFromString(keyAuthSecret)
 			Expect(err).NotTo(HaveOccurred(), "creating key-auth secret")
 			err = s.CreateResourceFromString(basicAuthSecret)
 			Expect(err).NotTo(HaveOccurred(), "creating basic-auth secret")
-			s.ResourceApplied("Consumer", "consumer-sample", defaultConsumer, 1)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(defaultConsumer, s.Namespace()), 1)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",
@@ -456,7 +517,7 @@ spec:
 			})
 
 			By("delete consumer")
-			err = s.DeleteResourceFromString(defaultConsumer)
+			err = s.DeleteResourceFromString(fmt.Sprintf(defaultConsumer, s.Namespace()))
 			Expect(err).NotTo(HaveOccurred(), "deleting consumer")
 
 			s.RequestAssert(&scaffold.RequestAssert{
@@ -492,7 +553,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: basic-auth
       name: basic-auth-sample
@@ -518,11 +579,29 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 
 		It("Should sync consumer when GatewayProxy is updated", func() {
-			s.ResourceApplied("Consumer", "consumer-sample", defaultCredential, 1)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(defaultCredential, s.Namespace()), 1)
 
 			// verify basic-auth works
 			s.RequestAssert(&scaffold.RequestAssert{
@@ -588,7 +667,7 @@ metadata:
   name: consumer-sample
 spec:
   gatewayRef:
-    name: apisix
+    name: %s
   credentials:
     - type: key-auth
       name: key-auth-sample
@@ -611,12 +690,30 @@ spec:
 `
 
 		BeforeEach(func() {
-			s.ApplyDefaultGatewayResource(defaultGatewayProxy, defaultGatewayClass, defaultGateway, defaultHTTPRoute)
+			gatewayName := s.Namespace()
+			By("create GatewayProxy")
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayProxy, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayProxy")
+			time.Sleep(time.Second)
+
+			By("create GatewayClass")
+			gatewayClassName := fmt.Sprintf("apisix-%d", time.Now().Unix())
+			err = s.CreateResourceFromString(fmt.Sprintf(defaultGatewayClass, gatewayClassName, s.GetControllerName()))
+			Expect(err).NotTo(HaveOccurred(), "creating GatewayClass")
+			time.Sleep(time.Second)
+
+			By("create Gateway")
+			err = s.CreateResourceFromStringWithNamespace(fmt.Sprintf(defaultGateway, gatewayName, gatewayClassName), s.Namespace())
+			Expect(err).NotTo(HaveOccurred(), "creating Gateway")
+			time.Sleep(time.Second)
+
+			By("create HTTPRoute")
+			s.ApplyHTTPRoute(types.NamespacedName{Namespace: s.Namespace(), Name: "httpbin"}, fmt.Sprintf(defaultHTTPRoute, gatewayName))
 		})
 
 		It("Should sync Consumer during startup", func() {
 			Expect(s.CreateResourceFromString(consumer2)).NotTo(HaveOccurred(), "creating unused consumer")
-			s.ResourceApplied("Consumer", "consumer-sample", consumer1, 1)
+			s.ResourceApplied("Consumer", "consumer-sample", fmt.Sprintf(consumer1, s.Namespace()), 1)
 
 			s.RequestAssert(&scaffold.RequestAssert{
 				Method: "GET",