update

Author: AlinsRan

internal/adc/cache/store.go

@@ -194,7 +194,6 @@ func (s *Store) Delete(name string, resourceTypes []string, Labels map[string]st
 			if err != nil {
 				log.Errorw("failed to list global rules", zap.Error(err))
 			}
-			log.Infow("deleting global rules", zap.Any("globalRules", globalRules))
 			for _, globalRule := range globalRules {
 				if err := targetCache.DeleteGlobalRule(globalRule); err != nil {
 					log.Errorw("failed to delete global rule", zap.Error(err), zap.String("global rule", globalRule.ID))

internal/adc/translator/handler.go

@@ -18,23 +18,18 @@
 package translator
 
 import (
-	"reflect"
-
 	"github.com/go-logr/logr"
 
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 )
 
 type Translator struct {
 	Log logr.Logger
-
-	register map[reflect.Type]ResourceHandler
 }
 
 func NewTranslator(log logr.Logger) *Translator {
 	return &Translator{
-		Log:      log,
-		register: make(map[reflect.Type]ResourceHandler),
+		Log: log,
 	}
 }
 

internal/adc/translator/translator.go

@@ -600,7 +600,7 @@ spec:
 		})
 
 		It("Should sync Consumer during startup", func() {
-			if s.Deployer.Name() == framework.BackendModeAPI7EE {
+			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 				Skip("skipping test in API7EE mode")
 			}
 			Expect(s.CreateResourceFromString(consumer2)).NotTo(HaveOccurred(), "creating unused consumer")

test/e2e/crds/v1alpha1/consumer.go

@@ -132,7 +132,7 @@ spec:
 `
 	BeforeEach(func() {
 		By("create GatewayProxy")
-		if s.Deployer.Name() == framework.BackendModeAPI7EE {
+		if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpecAPI7, s.Deployer.GetAdminEndpoint(), s.AdminKey()))
 		} else {
 			err = s.CreateResourceFromString(fmt.Sprintf(gatewayProxySpec, framework.ProviderType, s.AdminKey()))
@@ -160,8 +160,8 @@ spec:
 	})
 
 	Context("Test GatewayProxy update configs", func() {
-		It("scaling apisix pods to test that the controller watches endpoints", func() {
-			if s.Deployer.Name() == framework.BackendModeAPI7EE {
+		FIt("scaling apisix pods to test that the controller watches endpoints", func() {
+			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 				Skip("this case only for apisix/apisix-standalone mode")
 			}
 
@@ -207,7 +207,7 @@ spec:
 				keyword string
 			)
 
-			if framework.ProviderType == framework.BackendModeAPI7EE {
+			if framework.ProviderType == framework.ProviderTypeAPI7EE {
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["%s"]}`, s.Deployer.GetAdminEndpoint())
 			} else {
 				keyword = fmt.Sprintf(`{"config.ServerAddrs": ["http://%s:9180"]}`, s.GetPodIP(s.Namespace(), "app.kubernetes.io/name=apisix"))

test/e2e/crds/v1alpha1/gatewayproxy.go

@@ -239,7 +239,7 @@ spec:
 		})
 
 		It("Test ApisixRoute filterFunc", func() {
-			if s.Deployer.Name() == framework.BackendModeAPI7EE {
+			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 				Skip("filterFunc is not supported in api7ee")
 			}
 			const apisixRouteSpec = `
@@ -726,7 +726,7 @@ spec:
       servicePort: 80
 `
 		It("Should sync ApisixRoute during startup", func() {
-			if s.Deployer.Name() == framework.BackendModeAPI7EE {
+			if s.Deployer.Name() == framework.ProviderTypeAPI7EE {
 				Skip("skipping test in API7EE mode")
 			}
 			By("apply ApisixRoute")

test/e2e/crds/v2/route.go

@@ -155,8 +155,8 @@ spec:
 			})
 		})
 
-		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") == framework.BackendModeAPI7EE {
+		FIt("dataplane unavailable", func() {
+			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPISIXStandalone {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("apply ApisixRoute")

test/e2e/crds/v2/status.go

@@ -37,6 +37,5 @@ const (
 )
 
 const (
-	ProviderAPISIX    = "apisix"
-	BackendModeAPI7EE = "api7ee"
+	ProviderTypeAPI7EE = "api7ee"
 )

test/e2e/framework/api7_consts.go

@@ -27,7 +27,10 @@ import (
 )
 
 var (
-	ProviderType   = cmp.Or(os.Getenv("PROVIDER_TYPE"), "apisix-standalone")
+	ProviderTypeAPISIX           = "aapisix"
+	ProviderTypeAPISIXStandalone = "apisix-standalone"
+
+	ProviderType   = cmp.Or(os.Getenv("PROVIDER_TYPE"), ProviderTypeAPISIXStandalone)
 	IngressVersion = cmp.Or(os.Getenv("INGRESS_VERSION"), "v1")
 )
 

test/e2e/framework/apisix_consts.go

@@ -110,8 +110,8 @@ spec:
 			_ = s.DeleteResource("Gateway", "apisix")
 		})
 
-		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") == framework.BackendModeAPI7EE {
+		FIt("dataplane unavailable", func() {
+			if os.Getenv("PROVIDER_TYPE") != framework.ProviderTypeAPI7EE {
 				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("Create HTTPRoute")