fix: r

Signed-off-by: Ashing Zheng <[email protected]>

Author: ronething

test/e2e/crds/v1alpha1/consumer.go

@@ -23,7 +23,6 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 
-	"github.com/apache/apisix-ingress-controller/internal/provider/adc"
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
 
@@ -616,9 +615,6 @@ spec:
 		})
 
 		It("Should sync Consumer during startup", func() {
-			if s.Deployer.Name() == adc.BackendModeAPI7EE {
-				Skip("don't need to run on api7ee mode")
-			}
 			Expect(s.CreateResourceFromString(consumer2)).NotTo(HaveOccurred(), "creating unused consumer")
 			s.ResourceApplied("Consumer", "consumer-sample", consumer1, 1)
 

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -133,7 +133,7 @@ spec:
 `
 	BeforeEach(func() {
 		By("create GatewayProxy")
-		if s.Deployer.Name() == "api7ee" {
+		if s.Deployer.Name() == adc.BackendModeAPI7EE {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpecAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
 		} else {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpec, framework.ProviderType, s.AdminKey()))
@@ -162,7 +162,7 @@ spec:
 
 	Context("Test GatewayProxy update configs", func() {
 		It("scaling apisix pods to test that the controller watches endpoints", func() {
-			if s.Deployer.Name() == "api7ee" {
+			if s.Deployer.Name() == adc.BackendModeAPI7EE {
 				Skip("this case only for apisix/apisix-standalone mode")
 			}
 

test/e2e/crds/v2/route.go

@@ -224,7 +224,7 @@ spec:
 		})
 
 		It("Test ApisixRoute filterFunc", func() {
-			if s.Deployer.Name() == "api7ee" {
+			if s.Deployer.Name() == adc.BackendModeAPI7EE {
 				Skip("filterFunc is not supported in api7ee")
 			}
 			const apisixRouteSpec = `
@@ -711,9 +711,6 @@ spec:
       servicePort: 80
 `
 		It("Should sync ApisixRoute during startup", func() {
-			if s.Deployer.Name() == adc.BackendModeAPI7EE {
-				Skip("don't need to run on api7ee mode")
-			}
 			By("apply ApisixRoute")
 			Expect(s.CreateResourceFromString(route2)).ShouldNot(HaveOccurred(), "apply ApisixRoute with nonexistent ingressClassName")
 			Expect(s.CreateResourceFromString(route3)).ShouldNot(HaveOccurred(), "apply ApisixRoute without ingressClassName")

test/e2e/gatewayapi/httproute.go

@@ -33,6 +33,7 @@ import (
 	"sigs.k8s.io/gateway-api/apis/v1alpha2"
 
 	"github.com/apache/apisix-ingress-controller/api/v1alpha1"
+	"github.com/apache/apisix-ingress-controller/internal/provider/adc"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
 	"github.com/apache/apisix-ingress-controller/test/e2e/scaffold"
 )
@@ -74,7 +75,7 @@ spec:
           value: "%s"
 `
 	getGatewayProxySpec := func() string {
-		if s.Deployer.Name() == "api7ee" {
+		if s.Deployer.Name() == adc.BackendModeAPI7EE {
 			return fmt.Sprintf(gatewayProxyYamlAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey())
 		}
 		return fmt.Sprintf(gatewayProxyYaml, framework.ProviderType, s.AdminKey())