Merge remote-tracking branch 'origin/release-v2-dev' into refactor/xxxxx

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

Author: ronething

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

@@ -0,0 +1,112 @@
+name: APISIX Conformance Test
+
+on:
+  push:
+    branches:
+      - master
+      - release-v2-dev
+  pull_request:
+    branches:
+      - master
+      - release-v2-dev
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  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.22"
+
+      - name: Install kind
+        run: |
+          go install sigs.k8s.io/[email protected]
+
+  conformance-test:
+    timeout-minutes: 60
+    needs: 
+      - prepare
+    runs-on: buildjet-2vcpu-ubuntu-2204
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - name: Setup Go Env
+        uses: actions/setup-go@v4
+        with:
+          go-version: "1.22"
+
+      - name: Build images
+        env:
+          TAG: dev
+          ARCH: amd64
+          ENABLE_PROXY: "false"
+          BASE_IMAGE_TAG: "debug"
+          ADC_VERSION: "dev"
+        run: |
+          echo "building images..."
+          make build-image
+
+      - name: Launch Kind Cluster
+        run: |
+          make kind-up
+
+      - name: Install And Run Cloud Provider KIND
+        run: |
+          go install sigs.k8s.io/cloud-provider-kind@latest
+          nohup cloud-provider-kind > /tmp/kind-loadbalancer.log 2>&1 &
+  
+      - name: Install Gateway API And CRDs
+        run: |
+          make install
+
+      - name: Loading Docker Image to Kind Cluster
+        run: |
+          make kind-load-ingress-image
+
+      - name: Run Conformance Test
+        shell: bash
+        continue-on-error: true
+        run: |
+          make conformance-test-standalone
+      
+      - name: Get Logs from api7-ingress-controller
+        shell: bash
+        run: |
+          export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
+          kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
+
+      - name: Upload Gateway API Conformance Report
+        if: ${{ github.event_name == 'push' }}
+        uses: actions/upload-artifact@v4
+        with:
+          name: apisix-ingress-controller-conformance-report.yaml
+          path: apisix-ingress-controller-conformance-report.yaml
+
+      - name: Format Conformance Test Report
+        if: ${{ github.event_name == 'pull_request' }}
+        run: |
+          echo '# conformance test report' > report.md
+          echo '```yaml' >> report.md
+          cat apisix-ingress-controller-conformance-report.yaml >> report.md
+          echo '```' >> report.md
+
+      - name: Report Conformance Test Result to PR Comment
+        if: ${{ github.event_name == 'pull_request' }}
+        uses: mshick/add-pr-comment@v2
+        with:
+          message-id: 'apisix-conformance-test-report'
+          message-path: |
+            report.md

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

@@ -53,19 +53,35 @@ jobs:
           ARCH: amd64
           ENABLE_PROXY: "false"
           BASE_IMAGE_TAG: "debug"
+          ADC_VERSION: "dev"
         run: |
           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
 
+      - name: Loading Docker Image to Kind Cluster
+        run: |
+          make kind-load-ingress-image
+
       - name: Install Gateway API And CRDs
         run: |
           make install
 
       - name: Run E2E test suite
         shell: bash
+        env:
+          TEST_DIR: "./test/e2e/apisix/"
         run: |
-          make e2e-test-standalone
+          make e2e-test

.github/workflows/conformance-test.yml

@@ -125,6 +125,6 @@ jobs:
         if: ${{ github.event_name == 'pull_request' }}
         uses: mshick/add-pr-comment@v2
         with:
-          message-id: '${{ matrix.target }}'
+          message-id: 'conformance-test-report'
           message-path: |
             report.md

.github/workflows/e2e-test.yml

@@ -70,16 +70,13 @@ jobs:
           echo "building images..."
           make build-image
 
-      - name: Build Dockerfile.dev and extract adc binary
+      - name: Extract adc binary
         run: |
-          echo "Building Dockerfile.dev..."
-          docker build -f Dockerfile.dev -t adc-builder:latest .
           echo "Extracting adc binary..."
-          docker run --name adc-temp --entrypoint="" adc-builder:latest /bin/true
-          docker cp adc-temp:/bin/adc ./bin/adc
+          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 ./bin/adc
-          mv ./bin/adc /usr/local/bin/adc
+          chmod +x /usr/local/bin/adc
           echo "ADC binary extracted to /usr/local/bin/adc"
 
       - name: Launch Kind Cluster

.gitignore

@@ -36,3 +36,4 @@ apisix-ingress-controller-conformance-report.yaml
 .env
 
 charts/api7ee3
+docs/api

Dockerfile

@@ -1,11 +1,10 @@
-ARG ENABLE_PROXY=false
 ARG BASE_IMAGE_TAG=nonroot
 
 FROM debian:bullseye-slim AS deps
 WORKDIR /workspace
 
-ARG ADC_VERSION=0.19.0
 ARG TARGETARCH
+ARG ADC_VERSION
 
 RUN apt update \
     && apt install -y wget \

Dockerfile.dev

@@ -3,15 +3,13 @@ ARG ENABLE_PROXY=false
 FROM node:22 AS node_builder
 
 ARG TARGETARCH
-ARG ADC_COMMIT=e948079ed0576dbac29320ebfa01c9b7a298924c
 
 WORKDIR /app
 
 RUN apt update \
     && apt install -y git \
     && git clone --branch main https://github.com/api7/adc.git \
     && cd adc \
-    && git checkout ${ADC_COMMIT} \
     && corepack enable pnpm \
     && pnpm install \
     && NODE_ENV=production npx nx build cli \

Makefile

@@ -8,12 +8,14 @@ IMAGE_TAG ?= dev
 IMG ?= api7/api7-ingress-controller:$(IMAGE_TAG)
 # ENVTEST_K8S_VERSION refers to the version of kubebuilder assets to be downloaded by envtest binary.
 ENVTEST_K8S_VERSION = 1.30.0
-
 KIND_NAME ?= apisix-ingress-cluster
-GATEAY_API_VERSION ?= v1.2.0
 
+GATEAY_API_VERSION ?= v1.2.0
 DASHBOARD_VERSION ?= dev
+ADC_VERSION ?= 0.19.0
+
 TEST_TIMEOUT ?= 60m
+TEST_DIR ?= ./test/e2e/
 
 # CRD Reference Documentation
 CRD_REF_DOCS_VERSION ?= v0.1.0
@@ -109,12 +111,7 @@ kind-e2e-test: kind-up build-image kind-load-images e2e-test
 .PHONY: e2e-test
 e2e-test:
 	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
-	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test ./test/e2e/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
-
-.PHONY: e2e-test-standalone
-e2e-test-standalone:
-	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
-	go test ./test/e2e/apisix/ -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
+	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test $(TEST_DIR) -test.timeout=$(TEST_TIMEOUT) -v -ginkgo.v -ginkgo.focus="$(TEST_FOCUS)"
 
 .PHONY: download-api7ee3-chart
 download-api7ee3-chart:
@@ -127,6 +124,11 @@ download-api7ee3-chart:
 conformance-test:
 	DASHBOARD_VERSION=$(DASHBOARD_VERSION) go test -v ./test/conformance -tags=conformance -timeout 60m
 
+.PHONY: conformance-test-standalone
+conformance-test-standalone:
+	@kind get kubeconfig --name $(KIND_NAME) > $$KUBECONFIG
+	go test -v ./test/conformance/apisix -tags=conformance -timeout 60m
+
 .PHONY: lint
 lint: sort-import golangci-lint ## Run golangci-lint linter
 	$(GOLANGCI_LINT) run
@@ -202,11 +204,11 @@ build-multi-arch:
 .PHONY: build-multi-arch-image
 build-multi-arch-image: build-multi-arch
     # daemon.json: "features":{"containerd-snapshotter": true}
-	@docker buildx build --load --platform linux/amd64,linux/arm64 -t $(IMG) .
+	@docker buildx build --load --platform linux/amd64,linux/arm64 --build-arg ADC_VERSION=$(ADC_VERSION) -t $(IMG) .
 
 .PHONY: build-push-multi-arch-image
 build-push-multi-arch-image: build-multi-arch
-	@docker buildx build --push --platform linux/amd64,linux/arm64 -t $(IMG) .
+	@docker buildx build --push --platform linux/amd64,linux/arm64 --build-arg ADC_VERSION=$(ADC_VERSION) -t $(IMG) .
 
 .PHONY: run
 run: manifests generate fmt vet ## Run a controller from your host.
@@ -217,7 +219,12 @@ run: manifests generate fmt vet ## Run a controller from your host.
 # More info: https://docs.docker.com/develop/develop-images/build_enhancements/
 .PHONY: docker-build
 docker-build: set-e2e-goos build ## Build docker image with the manager.
-	$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile .
+	@echo "Building with ADC_VERSION=$(ADC_VERSION)"
+	@if [ "$(strip $(ADC_VERSION))" = "dev" ]; then \
+		$(CONTAINER_TOOL) build -t ${IMG} -f Dockerfile.dev . ; \
+	else \
+		$(CONTAINER_TOOL) build --build-arg ADC_VERSION=${ADC_VERSION} -t ${IMG} -f Dockerfile . ; \
+	fi
 
 .PHONY: docker-push
 docker-push: ## Push docker image with the manager.

api/v1alpha1/consumer_types.go

@@ -25,10 +25,13 @@ type Consumer struct {
 
 	// ConsumerSpec defines the configuration for a consumer, including consumer name,
 	// authentication credentials, and plugin settings.
-	Spec   ConsumerSpec `json:"spec,omitempty"`
-	Status Status       `json:"status,omitempty"`
+	Spec   ConsumerSpec   `json:"spec,omitempty"`
+	Status ConsumerStatus `json:"status,omitempty"`
 }
 
+type ConsumerStatus struct {
+	Status `json:",inline"`
+}
 type ConsumerSpec struct {
 	// GatewayRef specifies the gateway details.
 	GatewayRef GatewayRef `json:"gatewayRef,omitempty"`

api/v1alpha1/gatewayproxy_types.go

@@ -117,6 +117,7 @@ type ControlPlaneProvider struct {
 	// +kubebuilder:validation:MinItems=1
 	Endpoints []string `json:"endpoints"`
 
+	Service *ProviderService `json:"service,omitempty"`
 	// TlsVerify specifies whether to verify the TLS certificate of the control plane.
 	// +optional
 	TlsVerify *bool `json:"tlsVerify,omitempty"`
@@ -126,6 +127,14 @@ type ControlPlaneProvider struct {
 	Auth ControlPlaneAuth `json:"auth"`
 }
 
+type ProviderService struct {
+	Name string `json:"name"`
+
+	// +kubebuilder:validation:Minimum=1
+	// +kubebuilder:validation:Maximum=65535
+	Port int32 `json:"port,omitempty"`
+}
+
 // +kubebuilder:object:root=true
 // GatewayProxy is the Schema for the gatewayproxies API.
 type GatewayProxy struct {