feat: backport release v2

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

@@ -21,11 +21,11 @@ on:
   push:
     branches:
       - master
-      - next
+      - release-v2-dev
   pull_request:
     branches:
       - master
-      - next
+      - release-v2-dev
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -34,7 +34,7 @@ concurrency:
 jobs:
   prepare:
     name: Prepare
-    runs-on: ubuntu-latest
+    runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
         provider_type:
         - apisix-standalone
         - apisix
-    runs-on: ubuntu-latest
+    runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -124,3 +124,11 @@ jobs:
           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

@@ -21,11 +21,11 @@ on:
   push:
     branches:
       - master
-      - next
+      - release-v2-dev
   pull_request:
     branches:
       - master
-      - next
+      - release-v2-dev
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -34,7 +34,7 @@ concurrency:
 jobs:
   prepare:
     name: Prepare
-    runs-on: ubuntu-latest
+    runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
         - apisix.apache.org
         - networking.k8s.io
       fail-fast: false
-    runs-on: ubuntu-latest
+    runs-on: buildjet-2vcpu-ubuntu-2204
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -86,7 +86,7 @@ jobs:
       - name: Extract adc binary
         run: |
           echo "Extracting adc binary..."
-          docker create --name adc-temp apache/apisix-ingress-controller:dev
+          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

.github/workflows/codeql-analysis.yml

@@ -24,14 +24,13 @@ on:
   pull_request:
     branches:
       - master
-      - next
-      - 1.8.0
+      - release-v2-dev
   schedule:
     - cron: '25 5 * * 5'
 
 jobs:
   changes:
-    runs-on: ubuntu-latest
+    runs-on: buildjet-2vcpu-ubuntu-2204
     outputs:
       go: ${{ steps.filter.outputs.go }}
     steps:

.github/workflows/conformance-test.yml

@@ -0,0 +1,147 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: 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/kind@v0.23.0
+
+      - name: Install Helm
+        run: |
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+
+  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: Login to Private Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hkccr.ccs.tencentyun.com
+          username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
+          password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
+
+      - name: Build images
+        env:
+          TAG: dev
+          ARCH: amd64
+          ENABLE_PROXY: "false"
+          BASE_IMAGE_TAG: "debug"
+        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-images
+
+      - name: Install API7EE3
+        run: |
+          make download-api7ee3-chart
+
+      - name: Run Conformance Test
+        shell: bash
+        env:
+          API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
+        continue-on-error: true
+        run: |
+          make conformance-test
+
+      - 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: 'conformance-test-report'
+          message-path: |
+            report.md

.github/workflows/e2e-test.yml

@@ -0,0 +1,121 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+name: E2E 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/kind@v0.23.0
+
+      - name: Install Helm
+        run: |
+          curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
+          chmod 700 get_helm.sh
+          ./get_helm.sh
+
+  e2e-test:
+    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: Login to Private Registry
+        uses: docker/login-action@v1
+        with:
+          registry: hkccr.ccs.tencentyun.com
+          username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
+          password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
+
+      - name: Build images
+        env:
+          TAG: dev
+          ARCH: amd64
+          ENABLE_PROXY: "false"
+          BASE_IMAGE_TAG: "debug"
+        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: Install Gateway API And CRDs
+        run: |
+          make install
+
+      - name: Download API7EE3 Chart
+        run: |
+          make download-api7ee3-chart
+
+      - name: Loading Docker Image to Kind Cluster
+        run: |
+          make kind-load-images
+
+      - name: Run E2E test suite
+        shell: bash
+        env:
+          API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
+          PROVIDER_TYPE: api7ee
+        run: |
+          make e2e-test

.github/workflows/golangci-lint.yml

@@ -21,11 +21,11 @@ on:
   push:
     branches:
       - master
-      - next
+      - release-v2-dev
   pull_request:
     branches:
       - master
-      - next
+      - release-v2-dev
 
 jobs:
   golangci: