fix: r

Signed-off-by: ashing <[email protected]>

Author: ronething

.env

@@ -0,0 +1,5 @@
+ADC_EXPERIMENTAL_FEATURE_FLAGS=remote-state-file,parallel-backend-request 
+ADC_RUNNING_MODE=ingress 
+ADC_BACKEND=api7ee 
+ADC_SERVER=https://172.18.0.6:7443 
+ADC_TOKEN=a7adm-CAo25d64cIhz2rZW40E1hBC9gn403lAb2TPJJ6F0zSQB9h04HN-71ebdde934d643fd92b7101da0669853

config/samples/config.yaml

@@ -7,10 +7,10 @@ controller_name: apisix.apache.org/api7-ingress-controller  # The controller nam
 leader_election_id: "api7-ingress-controller-leader" # The leader election ID for the API7 Ingress Controller.
                                                         # The default value is "api7-ingress-controller-leader".
 leader_election:
-  lease_duration: 15s                   # lease_duration is the duration that non-leader candidates will wait
+  lease_duration: 30s                   # lease_duration is the duration that non-leader candidates will wait
                                         # after observing a leadership renewal until attempting to acquire leadership of a
                                         # leader election.
-  renew_deadline: 10s                   # renew_deadline is the time in seconds that the acting controller
+  renew_deadline: 20s                   # renew_deadline is the time in seconds that the acting controller
                                         # will retry refreshing leadership before giving up.
   retry_period: 2s                      # retry_period is the time in seconds that the acting controller
                                         # will wait between tries of actions with the controller.

internal/provider/adc/adc.go

@@ -32,6 +32,8 @@ type adcConfig struct {
 type adcClient struct {
 	sync.Mutex
 
+	execLock sync.Mutex
+
 	translator   *translator.Translator
 	ServerAddr   string
 	Token        string
@@ -230,6 +232,9 @@ func (d *adcClient) sync(ctx context.Context, task Task) error {
 }
 
 func (d *adcClient) execADC(ctx context.Context, config adcConfig, args []string) error {
+	d.execLock.Lock()
+	defer d.execLock.Unlock()
+
 	ctxWithTimeout, cancel := context.WithTimeout(ctx, d.syncTimeout)
 	defer cancel()
 	// todo: use adc config

test/e2e/framework/dashboard.go

@@ -367,6 +367,7 @@ func (f *Framework) GetDataplaneCertificates(gatewayGroupID string) *v1.Dataplan
 		POST("/api/gateway_groups/"+gatewayGroupID+"/dp_client_certificates").
 		WithBasicAuth("admin", "admin").
 		WithHeader("Content-Type", "application/json").
+		WithBytes([]byte(`{}`)).
 		Expect()
 
 	f.Logger.Logf(f.GinkgoT, "dataplane certificates issuer response: %s", respExp.Body().Raw())