Merge branch 'feat/apisix-mod' into feat/support-admin-api-mode

Author: dspo

internal/controller/config/config.go

@@ -113,12 +113,12 @@ func (c *Config) Validate() error {
 
 func validateProvider(config ProviderConfig) error {
 	switch config.Type {
-	case ProviderTypeStandalone:
+	case ProviderTypeStandalone, ProviderTypeAPISIX:
 		if config.SyncPeriod.Duration <= 0 {
 			return fmt.Errorf("sync_period must be greater than 0 for standalone provider")
 		}
 		return nil
-	case ProviderTypeAPI7EE, ProviderTypeAPISIX:
+	case ProviderTypeAPI7EE:
 		return nil
 	default:
 		return fmt.Errorf("unsupported provider type: %s", config.Type)

internal/provider/adc/adc.go

@@ -186,21 +186,11 @@ func (d *adcClient) Update(ctx context.Context, tctx *provider.TranslateContext,
 		}
 	}
 
-	switch d.BackendMode {
-	case BackendModeAPI7EE:
-		if apiv2.Is(obj) {
-			return nil
-		}
-	case BackendModeAPISIX:
-		// do nothing
-	case BackendModeAPISIXStandalone:
-		// This mode is full synchronization,
-		// which only needs to be saved in cache
-		// and triggered by a timer for synchronization
+	// This mode is full synchronization,
+	// which only needs to be saved in cache
+	// and triggered by a timer for synchronization
+	if d.BackendMode == BackendModeAPISIXStandalone || d.BackendMode == BackendModeAPISIX || apiv2.Is(obj) {
 		return nil
-	default:
-		return errors.Errorf("unknown backend mode: %s", d.BackendMode)
-
 	}
 
 	return d.sync(ctx, Task{
@@ -260,7 +250,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 	log.Debugw("successfully deleted resources from store", zap.Any("object", obj))
 
 	switch d.BackendMode {
-	case BackendModeAPISIXStandalone:
+	case BackendModeAPISIXStandalone, BackendModeAPISIX:
 		// Full synchronization is performed on a gateway by gateway basis
 		// and it is not possible to perform scheduled synchronization
 		// on deleted gateway level resources
@@ -271,7 +261,7 @@ func (d *adcClient) Delete(ctx context.Context, obj client.Object) error {
 			})
 		}
 		return nil
-	case BackendModeAPI7EE, BackendModeAPISIX:
+	case BackendModeAPI7EE:
 		return d.sync(ctx, Task{
 			Name:          obj.GetName(),
 			Labels:        labels,

test/conformance/apisix/suite_test.go

@@ -161,7 +161,7 @@ func TestMain(m *testing.M) {
 		Namespace:          namespace,
 		StatusAddress:      address,
 		InitSyncDelay:      1 * time.Minute,
-		ProviderType:       cmp.Or(os.Getenv(framework.EnvKeyProviderType), "apisix-standalone"),
+		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
 		ProviderSyncPeriod: 10 * time.Millisecond,
 	})
 

test/e2e/framework/apisix_consts.go

@@ -14,13 +14,14 @@ package framework
 
 import (
 	_ "embed"
+	"os"
 	"text/template"
 
 	"github.com/Masterminds/sprig/v3"
 )
 
-const (
-	EnvKeyProviderType = "PROVIDER_TYPE"
+var (
+	ProviderType = os.Getenv("PROVIDER_TYPE")
 )
 
 var (

test/e2e/framework/manifests/etcd.yaml

@@ -38,4 +38,4 @@ spec:
   - port: 2379
     targetPort: 2379
   selector:
-    app: etcd
+    app: etcd

test/e2e/scaffold/adc.go

@@ -132,8 +132,8 @@ func (a *adcDataplaneResource) dumpResources(ctx context.Context) (*translator.T
 		"ADC_SERVER=" + a.serverAddr,
 		"ADC_TOKEN=" + a.token,
 	}
-	if providerType := os.Getenv(framework.EnvKeyProviderType); providerType != "" {
-		adcEnv = append(adcEnv, "ADC_BACKEND="+providerType)
+	if framework.ProviderType != "" {
+		adcEnv = append(adcEnv, "ADC_BACKEND="+framework.ProviderType)
 	}
 
 	var stdout, stderr bytes.Buffer

test/e2e/scaffold/apisix_deployer.go

@@ -194,7 +194,7 @@ func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Serv
 
 	kubectlOpts := k8s.NewKubectlOptions("", "", opts.Namespace)
 
-	if os.Getenv(framework.EnvKeyProviderType) == adc.BackendModeAPISIX {
+	if framework.ProviderType == adc.BackendModeAPISIX {
 		opts.ServiceName = "apisix"
 		opts.ConfigProvider = "etcd"
 		// deploy etcd
@@ -236,7 +236,7 @@ func (s *APISIXDeployer) deployDataplane(opts *APISIXDeployOptions) *corev1.Serv
 func (s *APISIXDeployer) DeployIngress() {
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
-		ProviderType:       cmp.Or(os.Getenv(framework.EnvKeyProviderType), "apisix-standalone"),
+		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
 		ProviderSyncPeriod: 200 * time.Millisecond,
 		Namespace:          s.namespace,
 		Replicas:           1,
@@ -246,7 +246,7 @@ func (s *APISIXDeployer) DeployIngress() {
 func (s *APISIXDeployer) ScaleIngress(replicas int) {
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
-		ProviderType:       cmp.Or(os.Getenv(framework.EnvKeyProviderType), "apisix-standalone"),
+		ProviderType:       cmp.Or(framework.ProviderType, "apisix-standalone"),
 		ProviderSyncPeriod: 200 * time.Millisecond,
 		Namespace:          s.namespace,
 		Replicas:           replicas,