fix: r

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

Author: ronething

.github/workflows/apisix-e2e-test.yml

@@ -42,7 +42,7 @@ jobs:
         - apisix.apache.org
         - networking.k8s.io
       fail-fast: false
-    runs-on: buildjet-4vcpu-ubuntu-2204
+    runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -56,7 +56,7 @@ jobs:
 
       - name: Install kind
         run: |
-          go install sigs.k8s.io/kind@v0.24.0
+          go install sigs.k8s.io/kind@v0.23.0
 
       - name: Login to Registry
         uses: docker/login-action@v1

internal/controller/utils.go

@@ -1567,9 +1567,6 @@ func resolveServiceEndpoints(
 			return fmt.Errorf("failed to list endpoint slices: %v", err)
 		}
 
-		for _, ep := range endpoints.Items {
-			log.Debugw("gatewayproxy endpoint", zap.String("service", serviceNN.String()), zap.Any("endpoint", ep.Endpoints))
-		}
 		if len(subsetLabels) == 0 {
 			tctx.EndpointSlices[serviceNN] = endpoints.Items
 		} else {

internal/provider/adc/adc.go

@@ -115,8 +115,12 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...Opt
 	o := Options{}
 	o.ApplyOptions(opts)
 
-	executor := NewHTTPADCExecutor("http://127.0.0.1:3000", o.SyncTimeout)
-	log.Infow("using HTTP ADC Executor", zap.String("server_url", "http://127.0.0.1:3000"))
+	serverURL := os.Getenv("ADC_SERVER_URL")
+	if serverURL == "" {
+		serverURL = "http://127.0.0.1:3000"
+	}
+	executor := NewHTTPADCExecutor(serverURL, o.SyncTimeout)
+	log.Infow("using HTTP ADC Executor", zap.String("server_url", serverURL))
 
 	return &adcClient{
 		Options:    o,

test/e2e/crds/v2/status.go

@@ -200,6 +200,8 @@ spec:
 					),
 				)
 
+			time.Sleep(60 * time.Second)
+
 			By("update service to original spec")
 			serviceYaml, err = s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
 			Expect(err).NotTo(HaveOccurred(), "getting service yaml")

test/e2e/gatewayapi/status.go

@@ -156,6 +156,8 @@ spec:
 					),
 				)
 
+			time.Sleep(60 * time.Second)
+
 			By("update service to original spec")
 			serviceYaml, err = s.GetOutputFromString("svc", framework.ProviderType, "-o", "yaml")
 			Expect(err).NotTo(HaveOccurred(), "getting service yaml")

test/e2e/scaffold/apisix_deployer.go

@@ -257,20 +257,28 @@ func (s *APISIXDeployer) ScaleDataplane(replicas int) {
 }
 
 func (s *APISIXDeployer) DeployIngress() {
+	syncPeriod := 1 * time.Hour
+	if s.opts.SyncPeriod != 0 {
+		syncPeriod = s.opts.SyncPeriod
+	}
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
 		ProviderType:       framework.ProviderType,
-		ProviderSyncPeriod: 1 * time.Hour,
+		ProviderSyncPeriod: syncPeriod,
 		Namespace:          s.namespace,
 		Replicas:           1,
 	})
 }
 
 func (s *APISIXDeployer) ScaleIngress(replicas int) {
+	syncPeriod := 1 * time.Hour
+	if s.opts.SyncPeriod != 0 {
+		syncPeriod = s.opts.SyncPeriod
+	}
 	s.Framework.DeployIngress(framework.IngressDeployOpts{
 		ControllerName:     s.opts.ControllerName,
 		ProviderType:       framework.ProviderType,
-		ProviderSyncPeriod: 1 * time.Hour,
+		ProviderSyncPeriod: syncPeriod,
 		Namespace:          s.namespace,
 		Replicas:           replicas,
 	})

test/e2e/scaffold/scaffold.go

@@ -25,6 +25,7 @@ import (
 	"net/url"
 	"os"
 	"strings"
+	"time"
 
 	"github.com/gavv/httpexpect/v2"
 	"github.com/gruntwork-io/terratest/modules/k8s"
@@ -46,6 +47,7 @@ type Options struct {
 	Kubeconfig        string
 	APISIXAdminAPIKey string
 	ControllerName    string
+	SyncPeriod        time.Duration
 
 	NamespaceSelectorLabel map[string][]string
 	DisableNamespaceLabel  bool