fix: r

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

Author: ronething

Dockerfile.dev

@@ -3,7 +3,7 @@ ARG ENABLE_PROXY=false
 FROM node:22 AS node_builder
 
 ARG TARGETARCH
-ARG ADC_COMMIT=78484e87a0168e0f86d130bfae8f808d0d1a1e41
+ARG ADC_COMMIT=e948079ed0576dbac29320ebfa01c9b7a298924c
 
 WORKDIR /app
 
@@ -22,10 +22,13 @@ RUN apt update \
     && rm -rf /app
 
 FROM debian:bullseye-slim
+
+ARG TARGETARCH
+
 WORKDIR /app
 
 COPY --from=node_builder /bin/adc /bin/adc
-COPY ./bin/apisix-ingress-controller .
+COPY ./bin/apisix-ingress-controller_${TARGETARCH} ./apisix-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 
 ENTRYPOINT ["/app/apisix-ingress-controller"]

test/e2e/gatewayapi/controller.go

@@ -14,7 +14,6 @@ package gatewayapi
 
 import (
 	"fmt"
-	"log"
 	"time"
 
 	. "github.com/onsi/ginkgo/v2"
@@ -171,7 +170,6 @@ spec:
 			ResourceApplied(s1, "HTTPRoute", "httpbin", "gateway1", route1, 1)
 			routes, err := s1.DefaultDataplaneResource().Route().List(s1.Context)
 			Expect(err).NotTo(HaveOccurred())
-			log.Println("dump routes", routes)
 			Expect(routes).To(HaveLen(1))
 			assert.Equal(GinkgoT(), routes[0].Labels["k8s/controller-name"], "apisix.apache.org/apisix-ingress-controller-1")
 		})

test/e2e/scaffold/adc.go

@@ -20,12 +20,12 @@ import (
 	"os/exec"
 	"time"
 
+	"github.com/api7/gopkg/pkg/log"
 	"go.uber.org/zap"
 	"gopkg.in/yaml.v3"
 
 	adctypes "github.com/apache/apisix-ingress-controller/api/adc"
 	"github.com/apache/apisix-ingress-controller/internal/provider/adc/translator"
-	"github.com/api7/gopkg/pkg/log"
 )
 
 // DataplaneResource defines the interface for accessing dataplane resources

test/e2e/scaffold/api7_deployer.go

@@ -276,7 +276,7 @@ func (s *API7Deployer) GetAdminEndpoint(_ ...*corev1.Service) string {
 func (s *API7Deployer) DefaultDataplaneResource() DataplaneResource {
 	return newADCDataplaneResource(
 		"api7ee",
-		fmt.Sprintf("http://%s", s.Framework.GetDashboardEndpoint()),
+		fmt.Sprintf("http://%s", s.GetDashboardEndpoint()),
 		s.AdminKey(),
 		false,
 	)

test/e2e/scaffold/apisix_deployer.go

@@ -92,7 +92,9 @@ func (s *APISIXDeployer) BeforeEach() {
 	e.Add(func() {
 		s.DeployDataplane()
 		s.DeployIngress()
-		s.createAdminTunnel(s.dataplaneService)
+		adminTunnel, err := s.createAdminTunnel(s.dataplaneService)
+		Expect(err).NotTo(HaveOccurred())
+		s.adminTunnel = adminTunnel
 	})
 	e.Add(s.DeployTestService)
 	e.Wait()