fix manually

Author: dspo

internal/provider/adc/adc.go

@@ -396,7 +396,18 @@ func (d *adcClient) sync(ctx context.Context, task Task) error {
 			if err != nil {
 				return err
 			}
-			task.Resources.GlobalRules = *globalRules
+			var globalrule adctypes.GlobalRule
+			if len(globalRules) > 0 {
+				merged := make(adctypes.Plugins)
+				for _, item := range globalRules {
+					for k, v := range item.Plugins {
+						merged[k] = v
+					}
+				}
+				globalrule = adctypes.GlobalRule(merged)
+			}
+
+			task.Resources.GlobalRules = globalrule
 			log.Debugw("syncing resources global rules", zap.Any("globalRules", task.Resources.GlobalRules))
 
 			syncFilePath, cleanup, err := prepareSyncFile(task.Resources)

test/e2e/framework/api7_gateway.go

@@ -59,6 +59,7 @@ type API7DeployOptions struct {
 	ServiceType      string
 	ServiceHTTPPort  int
 	ServiceHTTPSPort int
+	Replicas         *int
 }
 
 func (f *Framework) DeployGateway(opts API7DeployOptions) *corev1.Service {

test/e2e/framework/manifests/dp.yaml

@@ -158,7 +158,7 @@ metadata:
     app.kubernetes.io/name: apisix
   name: api7ee3-apisix{{- if .TLSEnabled }}-mtls{{- end }}
 spec:
-  replicas: 1
+  replicas: {{ default 1 .Replicas }}
   selector:
     matchLabels:
       app.kubernetes.io/instance: api7ee3

test/e2e/scaffold/api7_deployer.go

@@ -27,6 +27,7 @@ import (
 	. "github.com/onsi/gomega"    //nolint:staticcheck
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/utils/ptr"
 
 	"github.com/apache/apisix-ingress-controller/pkg/utils"
 	"github.com/apache/apisix-ingress-controller/test/e2e/framework"
@@ -160,6 +161,9 @@ func (s *API7Deployer) DeployDataplane(deployOpts DeployDataplaneOptions) {
 	if deployOpts.ServiceHTTPSPort != 0 {
 		opts.ServiceHTTPSPort = deployOpts.ServiceHTTPSPort
 	}
+	if deployOpts.Replicas != nil {
+		opts.Replicas = deployOpts.Replicas
+	}
 
 	svc := s.DeployGateway(opts)
 
@@ -171,6 +175,12 @@ func (s *API7Deployer) DeployDataplane(deployOpts DeployDataplaneOptions) {
 	}
 }
 
+func (s *API7Deployer) ScaleDataplane(replicas int) {
+	s.DeployDataplane(DeployDataplaneOptions{
+		Replicas: ptr.To(replicas),
+	})
+}
+
 func (s *API7Deployer) newAPISIXTunnels() error {
 	serviceName := "api7ee3-apisix-gateway-mtls"
 	httpTunnel, httpsTunnel, err := s.createDataplaneTunnels(s.dataplaneService, s.kubectlOptions, serviceName)