fix: resolve externalName when gatewayproxy provider is service (#228)

ronething · web-flow · commit 70d37e3d23ac · 2025-08-12T16:51:26.000+08:00
Signed-off-by: Ashing Zheng &lt;axingfly@gmail.com&gt;
diff --git a/.github/workflows/apisix-conformance-test.yml b/.github/workflows/apisix-conformance-test.yml
@@ -35,27 +35,8 @@ permissions:
   pull-requests: write
 
 jobs:
-  prepare:
-    name: Prepare
-    runs-on: buildjet-2vcpu-ubuntu-2204
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Go Env
-        id: go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.23"
-
-      - name: Install kind
-        run: |
-          go install sigs.k8s.io/kind@v0.23.0
-
   conformance-test:
     timeout-minutes: 60
-    needs: 
-      - prepare
     strategy:
       matrix:
         provider_type:
@@ -72,6 +53,9 @@ jobs:
         uses: actions/setup-go@v4
         with:
           go-version: "1.23"
+      - name: Install kind
+        run: |
+          go install sigs.k8s.io/kind@v0.23.0
 
       - name: Login to Registry
         uses: docker/login-action@v1
diff --git a/.github/workflows/apisix-e2e-test.yml b/.github/workflows/apisix-e2e-test.yml
@@ -32,26 +32,7 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  prepare:
-    name: Prepare
-    runs-on: buildjet-2vcpu-ubuntu-2204
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Go Env
-        id: go
-        uses: actions/setup-go@v4
-        with:
-          go-version: "1.23"
-
-      - name: Install kind
-        run: |
-          go install sigs.k8s.io/kind@v0.23.0
-
   e2e-test:
-    needs: 
-      - prepare
     strategy:
       matrix:
         provider_type:
@@ -73,6 +54,10 @@ jobs:
         with:
           go-version: "1.23"
 
+      - name: Install kind
+        run: |
+          go install sigs.k8s.io/kind@v0.23.0
+
       - name: Login to Registry
         uses: docker/login-action@v1
         with:
@@ -118,5 +103,6 @@ jobs:
           TEST_DIR: "./test/e2e/apisix/"
           PROVIDER_TYPE: ${{ matrix.provider_type }}
           TEST_LABEL: ${{ matrix.cases_subset }}
+          TEST_ENV: CI
         run: |
           make e2e-test
diff --git a/.github/workflows/e2e-test.yml b/.github/workflows/e2e-test.yml
@@ -124,5 +124,6 @@ jobs:
         env:
           API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
           PROVIDER_TYPE: api7ee
+          TEST_ENV: CI
         run: |
           make e2e-test
diff --git a/internal/provider/adc/adc.go b/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")
-	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,
diff --git a/internal/provider/adc/config.go b/internal/provider/adc/config.go
@@ -26,6 +26,7 @@ import (
 
 	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
+	corev1 "k8s.io/api/core/v1"
 	discoveryv1 "k8s.io/api/discovery/v1"
 	k8stypes "k8s.io/apimachinery/pkg/types"
 	"k8s.io/utils/ptr"
@@ -120,8 +121,24 @@ func (d *adcClient) getConfigsForGatewayProxy(tctx *provider.TranslateContext, g
 				config.ServerAddrs = append(config.ServerAddrs, "http://"+net.JoinHostPort(node.Host, strconv.Itoa(node.Port)))
 			}
 		} else {
-			config.ServerAddrs = []string{
-				fmt.Sprintf("http://%s.%s:%d", provider.ControlPlane.Service.Name, gatewayProxy.Namespace, provider.ControlPlane.Service.Port),
+			key := k8stypes.NamespacedName{
+				Namespace: gatewayProxy.Namespace,
+				Name:      provider.ControlPlane.Service.Name,
+			}
+			service, ok := tctx.Services[key]
+			if !ok {
+				return nil, fmt.Errorf("service %s not found", key)
+			}
+			refPort := provider.ControlPlane.Service.Port
+			// if the service is external name, we should use the external name as the server address
+			if service.Spec.Type == corev1.ServiceTypeExternalName {
+				config.ServerAddrs = []string{
+					fmt.Sprintf("http://%s:%d", service.Spec.ExternalName, refPort),
+				}
+			} else {
+				config.ServerAddrs = []string{
+					fmt.Sprintf("http://%s.%s:%d", key.Name, key.Namespace, refPort),
+				}
 			}
 		}
 
diff --git a/internal/provider/adc/executor.go b/internal/provider/adc/executor.go
@@ -227,10 +227,10 @@ type HTTPADCExecutor struct {
 }
 
 // NewHTTPADCExecutor creates a new HTTPADCExecutor with the specified ADC Server URL
-func NewHTTPADCExecutor(serverURL string) *HTTPADCExecutor {
+func NewHTTPADCExecutor(serverURL string, timeout time.Duration) *HTTPADCExecutor {
 	return &HTTPADCExecutor{
 		httpClient: &http.Client{
-			Timeout: 30 * time.Second,
+			Timeout: timeout,
 		},
 		serverURL: serverURL,
 	}
@@ -272,7 +272,7 @@ func (e *HTTPADCExecutor) runHTTPSync(ctx context.Context, mode string, config a
 
 // runHTTPSyncForSingleServer performs HTTP sync to a single ADC Server
 func (e *HTTPADCExecutor) runHTTPSyncForSingleServer(ctx context.Context, serverAddr, mode string, config adcConfig, args []string) error {
-	ctx, cancel := context.WithTimeout(ctx, 15*time.Second)
+	ctx, cancel := context.WithTimeout(ctx, e.httpClient.Timeout)
 	defer cancel()
 
 	// Parse args to extract labels, types, and file path
@@ -383,6 +383,8 @@ func (e *HTTPADCExecutor) buildHTTPRequest(ctx context.Context, serverAddr, mode
 		return nil, fmt.Errorf("failed to marshal request body: %w", err)
 	}
 
+	log.Debugw("request body", zap.String("body", string(jsonData)))
+
 	log.Debugw("sending HTTP request to ADC Server",
 		zap.String("url", e.serverURL+"/sync"),
 		zap.String("server", serverAddr),
diff --git a/test/e2e/crds/v2/basic.go b/test/e2e/crds/v2/basic.go
@@ -137,7 +137,7 @@ spec:
 
 			By("create IngressClass")
 			ingressClass := fmt.Sprintf(ingressClassYaml, framework.IngressVersion, s.Namespace())
-			err = s.CreateResourceFromString(ingressClass)
+			err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
 			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
 			time.Sleep(5 * time.Second)
 
diff --git a/test/e2e/crds/v2/route.go b/test/e2e/crds/v2/route.go
@@ -66,7 +66,7 @@ spec:
 
 		By("create IngressClass")
 		ingressClass := fmt.Sprintf(ingressClassYaml, framework.IngressVersion, s.Namespace())
-		err = s.CreateResourceFromString(ingressClass)
+		err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
 		Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
 		time.Sleep(5 * time.Second)
 	})
diff --git a/test/e2e/crds/v2/status.go b/test/e2e/crds/v2/status.go
@@ -39,6 +39,8 @@ var _ = Describe("Test apisix.apache.org/v2 Status", Label("apisix.apache.org",
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
+			// for triggering the sync
+			SyncPeriod: 3 * time.Second,
 		})
 		applier = framework.NewApplier(s.GinkgoT, s.K8sClient, s.CreateResourceFromString)
 	)
@@ -66,7 +68,7 @@ spec:
     name: "apisix-proxy-config"
 `
 			ingressClass := fmt.Sprintf(ingressClassYaml, framework.IngressVersion, s.Namespace())
-			err = s.CreateResourceFromString(ingressClass)
+			err = s.CreateResourceFromStringWithNamespace(ingressClass, "")
 			Expect(err).NotTo(HaveOccurred(), "creating IngressClass")
 			time.Sleep(5 * time.Second)
 		})
@@ -157,8 +159,8 @@ spec:
 		})
 
 		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") != adc.BackendModeAPISIXStandalone {
-				Skip("only for apisix standalone mode")
+			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPI7EE {
+				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("apply ApisixRoute")
 			applier.MustApplyAPIv2(types.NamespacedName{Namespace: s.Namespace(), Name: "default"}, &apiv2.ApisixRoute{}, ar)
@@ -192,7 +194,7 @@ spec:
 			s.RetryAssertion(func() string {
 				output, _ := s.GetOutputFromString("ar", "default", "-o", "yaml")
 				return output
-			}).WithTimeout(80 * time.Second).
+			}).WithTimeout(60 * time.Second).
 				Should(
 					And(
 						ContainSubstring(`status: "False"`),
@@ -215,7 +217,7 @@ spec:
 			s.RetryAssertion(func() string {
 				output, _ := s.GetOutputFromString("ar", "default", "-o", "yaml")
 				return output
-			}).WithTimeout(80 * time.Second).
+			}).WithTimeout(60 * time.Second).
 				Should(
 					And(
 						ContainSubstring(`status: "True"`),
diff --git a/test/e2e/framework/manifests/ingress.yaml b/test/e2e/framework/manifests/ingress.yaml
@@ -455,11 +455,7 @@ spec:
             port: 3001
           initialDelaySeconds: 5
           periodSeconds: 5
-        securityContext:
-          allowPrivilegeEscalation: false
-          capabilities:
-            drop:
-            - ALL
+        securityContext: {}
       volumes:
       - name: ingress-config
         configMap:
diff --git a/test/e2e/gatewayapi/status.go b/test/e2e/gatewayapi/status.go
@@ -36,6 +36,8 @@ var _ = Describe("Test Gateway API Status", Label("networking.k8s.io", "httprout
 	var (
 		s = scaffold.NewScaffold(&scaffold.Options{
 			ControllerName: "apisix.apache.org/apisix-ingress-controller",
+			// for triggering the sync
+			SyncPeriod: 3 * time.Second,
 		})
 	)
 	Context("Test HTTPRoute Sync Status", func() {
@@ -112,8 +114,8 @@ spec:
 		})
 
 		It("dataplane unavailable", func() {
-			if os.Getenv("PROVIDER_TYPE") != adc.BackendModeAPISIXStandalone {
-				Skip("only for apisix standalone mode")
+			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPI7EE {
+				Skip("skip for api7ee mode because it use dashboard admin api")
 			}
 			By("Create HTTPRoute")
 			err := s.CreateResourceFromString(httproute)
@@ -148,7 +150,7 @@ spec:
 			s.RetryAssertion(func() string {
 				output, _ := s.GetOutputFromString("httproute", "httpbin", "-o", "yaml")
 				return output
-			}).WithTimeout(80 * time.Second).
+			}).WithTimeout(60 * time.Second).
 				Should(
 					And(
 						ContainSubstring(`status: "False"`),
@@ -171,7 +173,7 @@ spec:
 			s.RetryAssertion(func() string {
 				output, _ := s.GetOutputFromString("httproute", "httpbin", "-o", "yaml")
 				return output
-			}).WithTimeout(80 * time.Second).
+			}).WithTimeout(60 * time.Second).
 				Should(
 					And(
 						ContainSubstring(`status: "True"`),
diff --git a/test/e2e/scaffold/apisix_deployer.go b/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,
 	})
diff --git a/test/e2e/scaffold/scaffold.go b/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
@@ -220,16 +222,23 @@ func (s *Scaffold) GetDeploymentLogs(name string) string {
 	var buf strings.Builder
 	for _, pod := range pods.Items {
 		buf.WriteString(fmt.Sprintf("=== pod: %s ===\n", pod.Name))
-		logs, err := cli.CoreV1().RESTClient().Get().
-			Resource("pods").
-			Namespace(s.namespace).
-			Name(pod.Name).SubResource("log").
-			Do(context.TODO()).
-			Raw()
-		if err == nil {
-			buf.Write(logs)
+		for _, c := range pod.Spec.Containers {
+			buf.WriteString(fmt.Sprintf("--- container: %s ---\n", c.Name))
+			logs, err := cli.CoreV1().RESTClient().Get().
+				Resource("pods").
+				Namespace(s.namespace).
+				Name(pod.Name).
+				SubResource("log").
+				Param("container", c.Name).
+				Do(context.TODO()).
+				Raw()
+			if err == nil {
+				buf.Write(logs)
+			} else {
+				buf.WriteString(fmt.Sprintf("Error getting logs: %v\n", err))
+			}
+			buf.WriteByte('\n')
 		}
-		buf.WriteByte('\n')
 	}
 	return buf.String()
 }
