(apisix-ingress-controller) branch master updated: chore: upgrade adc to 0.21.0 (#2532)

[al...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

alinsran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix-ingress-controller.git


The following commit(s) were added to refs/heads/master by this push:
     new ba39a7ac chore: upgrade adc to 0.21.0 (#2532)
ba39a7ac is described below

commit ba39a7ac7e804519ada390c88af6c615c5ef5809
Author: AlinsRan <al...@apache.org>
AuthorDate: Thu Aug 28 08:19:30 2025 +0800

    chore: upgrade adc to 0.21.0 (#2532)
---
 .github/workflows/apisix-conformance-test.yml | 2 --
 .github/workflows/apisix-e2e-test.yml         | 2 --
 Makefile                                      | 5 ++++-
 test/e2e/scaffold/adc.go                      | 9 +++++++--
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/apisix-conformance-test.yml b/.github/workflows/apisix-conformance-test.yml
index f6c7c9ca..1976d83a 100644
--- a/.github/workflows/apisix-conformance-test.yml
+++ b/.github/workflows/apisix-conformance-test.yml
@@ -61,8 +61,6 @@ jobs:
         provider_type:
         - apisix-standalone
         - apisix
-    env:
-      ADC_VERSION: "dev"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
diff --git a/.github/workflows/apisix-e2e-test.yml b/.github/workflows/apisix-e2e-test.yml
index 087963e3..13f1aac0 100644
--- a/.github/workflows/apisix-e2e-test.yml
+++ b/.github/workflows/apisix-e2e-test.yml
@@ -43,8 +43,6 @@ jobs:
         - networking.k8s.io
       fail-fast: false
     runs-on: ubuntu-latest
-    env:
-      ADC_VERSION: "dev"
     steps:
       - name: Checkout
         uses: actions/checkout@v4
diff --git a/Makefile b/Makefile
index 6fbf9e8b..0af8f3ec 100644
--- a/Makefile
+++ b/Makefile
@@ -28,7 +28,7 @@ ENVTEST_K8S_VERSION = 1.30.0
 KIND_NAME ?= apisix-ingress-cluster
 
 GATEAY_API_VERSION ?= v1.2.0
-ADC_VERSION ?= 0.20.0
+ADC_VERSION ?= 0.21.0
 
 GINKGO_VERSION ?= 2.20.0
 TEST_TIMEOUT ?= 80m
@@ -306,6 +306,9 @@ CONTROLLER_TOOLS_VERSION ?= v0.17.2
 ENVTEST_VERSION ?= release-0.18
 GOLANGCI_LINT_VERSION ?= v2.1.5
 
+## export PATH so that the tools are found
+export PATH := $(LOCALBIN):$(PATH)
+
 .PHONY: kustomize
 kustomize: $(KUSTOMIZE) ## Download kustomize locally if necessary.
 $(KUSTOMIZE): $(LOCALBIN)
diff --git a/test/e2e/scaffold/adc.go b/test/e2e/scaffold/adc.go
index 96c9e3bd..0a45cd33 100644
--- a/test/e2e/scaffold/adc.go
+++ b/test/e2e/scaffold/adc.go
@@ -35,16 +35,21 @@ import (
 )
 
 var (
-	adcExec = "./bin/adc"
+	adcExec = "adc"
 	adcArgs []string
 )
 
 func init() {
 	adc := os.Getenv("ADC_BIN")
-	if adc != "" && strings.Contains(adc, "node") {
+	if adc == "" {
+		return
+	}
+	if strings.Contains(adc, "node") {
 		parts := strings.Fields(adc)
 		adcExec = parts[0]
 		adcArgs = parts[1:]
+	} else {
+		adcExec = adc
 	}
 }