chore: upgrade adc to 0.21.0 (#2532)

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

Author: AlinsRan

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

@@ -40,8 +40,6 @@ jobs:
         provider_type:
         - apisix-standalone
         - apisix
-    env:
-      ADC_VERSION: "dev"
     runs-on: ubuntu-latest
     steps:
       - name: Checkout

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

@@ -41,8 +41,6 @@ jobs:
         - networking.k8s.io
       fail-fast: false
     runs-on: ubuntu-latest
-    env:
-      ADC_VERSION: "dev"
     steps:
       - name: Checkout
         uses: actions/checkout@v4

Makefile

@@ -31,7 +31,7 @@ KIND_NODE_IMAGE ?= kindest/node:v1.30.0@sha256:047357ac0cfea04663786a612ba1eaba9
 
 GATEAY_API_VERSION ?= v1.2.0
 DASHBOARD_VERSION ?= dev
-ADC_VERSION ?= 0.20.0
+ADC_VERSION ?= 0.21.0
 
 GINKGO_VERSION ?= 2.20.0
 TEST_TIMEOUT ?= 80m
@@ -346,6 +346,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)

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
 	}
 }