fix: r

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

Author: ronething

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

@@ -76,15 +76,6 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Extract adc binary
-        run: |
-          echo "Extracting adc binary..."
-          docker create --name adc-temp api7/api7-ingress-controller:dev
-          docker cp adc-temp:/bin/adc /usr/local/bin/adc
-          docker rm adc-temp
-          chmod +x /usr/local/bin/adc
-          echo "ADC binary extracted to /usr/local/bin/adc"
-
       - name: Launch Kind Cluster
         run: |
           make kind-up

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

@@ -89,15 +89,6 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Extract adc binary
-        run: |
-          echo "Extracting adc binary..."
-          docker create --name adc-temp api7/api7-ingress-controller:dev
-          docker cp adc-temp:/bin/adc /usr/local/bin/adc
-          docker rm adc-temp
-          chmod +x /usr/local/bin/adc
-          echo "ADC binary extracted to /usr/local/bin/adc"
-
       - name: Install v2 CRDs
         run: |
           make install-crds-nocel

.github/workflows/e2e-test.yml

@@ -94,15 +94,6 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Extract adc binary
-        run: |
-          echo "Extracting adc binary..."
-          docker create --name adc-temp api7/api7-ingress-controller:dev
-          docker cp adc-temp:/bin/adc /usr/local/bin/adc
-          docker rm adc-temp
-          chmod +x /usr/local/bin/adc
-          echo "ADC binary extracted to /usr/local/bin/adc"
-
       - name: Launch Kind Cluster
         run: |
           make kind-up

Dockerfile

@@ -17,27 +17,12 @@
 
 ARG BASE_IMAGE_TAG=nonroot
 
-FROM debian:bullseye-slim AS deps
-WORKDIR /workspace
-
-ARG TARGETARCH
-ARG ADC_VERSION
-
-RUN apt update \
-    && apt install -y wget \
-    && wget https://github.com/api7/adc/releases/download/v${ADC_VERSION}/adc_${ADC_VERSION}_linux_${TARGETARCH}.tar.gz -O adc.tar.gz \
-    && tar -zxvf adc.tar.gz \
-    && mv adc /bin/adc \
-    && rm -rf adc.tar.gz \
-    && apt autoremove -y wget
-
 FROM gcr.io/distroless/cc-debian12:${BASE_IMAGE_TAG}
 
 ARG TARGETARCH
 
 WORKDIR /app
 
-COPY --from=deps /bin/adc /bin/adc
 COPY ./bin/apisix-ingress-controller_${TARGETARCH} ./apisix-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 

Dockerfile.dev

@@ -17,32 +17,12 @@
 
 ARG ENABLE_PROXY=false
 
-FROM node:22 AS node_builder
-
-ARG TARGETARCH
-
-WORKDIR /app
-
-RUN apt update \
-    && apt install -y git \
-    && git clone --depth 1 --branch main https://github.com/api7/adc.git \
-    && cd adc \
-    && corepack enable pnpm \
-    && pnpm install \
-    && NODE_ENV=production npx nx build cli \
-    && node --experimental-sea-config apps/cli/node-sea.json \
-    && npx ts-node apps/cli/scripts/download-node.ts \
-    && npx postject ./node-binary/linux-${TARGETARCH} NODE_SEA_BLOB sea-prep.blob --sentinel-fuse NODE_SEA_FUSE_fce680ab2cc467b6e072b8b5df1996b2 \
-    && mv ./node-binary/linux-${TARGETARCH} /bin/adc \
-    && rm -rf /app
-
 FROM debian:bullseye-slim
 
 ARG TARGETARCH
 
 WORKDIR /app
 
-COPY --from=node_builder /bin/adc /bin/adc
 COPY ./bin/apisix-ingress-controller_${TARGETARCH} ./apisix-ingress-controller
 COPY ./config/samples/config.yaml ./conf/config.yaml
 

test/e2e/crds/v2/status.go

@@ -179,8 +179,13 @@ spec:
 			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
 			oldSpec := k8sservice.Spec
-			k8sservice.Spec.Selector = map[string]string{
-				"app.kubernetes.io/name": "nonexistent",
+			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPISIX {
+				k8sservice.Spec.Selector = map[string]string{
+					"app.kubernetes.io/name": "nonexistent",
+				}
+			} else {
+				k8sservice.Spec.Type = corev1.ServiceTypeExternalName
+				k8sservice.Spec.ExternalName = "invalid.host"
 			}
 			newServiceYaml, err := yaml.Marshal(k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "marshalling service")

test/e2e/gatewayapi/status.go

@@ -107,9 +107,6 @@ spec:
 			Expect(gwyaml).To(ContainSubstring(`status: "True"`), "checking Gateway condition status")
 			Expect(gwyaml).To(ContainSubstring("message: the gateway has been accepted by the apisix-ingress-controller"), "checking Gateway condition message")
 		})
-		AfterEach(func() {
-			_ = s.DeleteResource("Gateway", "apisix")
-		})
 
 		FIt("dataplane unavailable", func() {
 			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPI7EE {
@@ -135,8 +132,13 @@ spec:
 			err = yaml.Unmarshal([]byte(serviceYaml), &k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "unmarshalling service")
 			oldSpec := k8sservice.Spec
-			k8sservice.Spec.Selector = map[string]string{
-				"app.kubernetes.io/name": "nonexistent",
+			if os.Getenv("PROVIDER_TYPE") == adc.BackendModeAPISIX {
+				k8sservice.Spec.Selector = map[string]string{
+					"app.kubernetes.io/name": "nonexistent",
+				}
+			} else {
+				k8sservice.Spec.Type = corev1.ServiceTypeExternalName
+				k8sservice.Spec.ExternalName = "invalid.host"
 			}
 			newServiceYaml, err := yaml.Marshal(k8sservice)
 			Expect(err).NotTo(HaveOccurred(), "marshalling service")