Skip to content

Commit deed0a8

Browse files
AlinsRanAlinsRan
committed
feat: backport release v2
1 parent bab818f commit deed0a8

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+16368
-245
lines changed

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
push:
2222
branches:
2323
- master
24-
- next
24+
- release-v2-dev
2525
pull_request:
2626
branches:
2727
- master
28-
- next
28+
- release-v2-dev
2929

3030
concurrency:
3131
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
prepare:
3636
name: Prepare
37-
runs-on: ubuntu-latest
37+
runs-on: buildjet-2vcpu-ubuntu-2204
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v4
@@ -58,7 +58,7 @@ jobs:
5858
provider_type:
5959
- apisix-standalone
6060
- apisix
61-
runs-on: ubuntu-latest
61+
runs-on: buildjet-2vcpu-ubuntu-2204
6262
steps:
6363
- name: Checkout
6464
uses: actions/checkout@v4
@@ -124,3 +124,11 @@ jobs:
124124
echo '```yaml' >> report.md
125125
cat apisix-ingress-controller-conformance-report.yaml >> report.md
126126
echo '```' >> report.md
127+
128+
- name: Report Conformance Test Result to PR Comment
129+
if: ${{ github.event_name == 'pull_request' }}
130+
uses: mshick/add-pr-comment@v2
131+
with:
132+
message-id: 'apisix-conformance-test-report'
133+
message-path: |
134+
report.md

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
push:
2222
branches:
2323
- master
24-
- next
24+
- release-v2-dev
2525
pull_request:
2626
branches:
2727
- master
28-
- next
28+
- release-v2-dev
2929

3030
concurrency:
3131
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
prepare:
3636
name: Prepare
37-
runs-on: ubuntu-latest
37+
runs-on: buildjet-2vcpu-ubuntu-2204
3838
steps:
3939
- name: Checkout
4040
uses: actions/checkout@v4
@@ -61,7 +61,7 @@ jobs:
6161
- apisix.apache.org
6262
- networking.k8s.io
6363
fail-fast: false
64-
runs-on: ubuntu-latest
64+
runs-on: buildjet-2vcpu-ubuntu-2204
6565
steps:
6666
- name: Checkout
6767
uses: actions/checkout@v4
@@ -86,7 +86,7 @@ jobs:
8686
- name: Extract adc binary
8787
run: |
8888
echo "Extracting adc binary..."
89-
docker create --name adc-temp apache/apisix-ingress-controller:dev
89+
docker create --name adc-temp api7/api7-ingress-controller:dev
9090
docker cp adc-temp:/bin/adc /usr/local/bin/adc
9191
docker rm adc-temp
9292
chmod +x /usr/local/bin/adc

‎.github/workflows/codeql-analysis.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,13 @@ on:
2424
pull_request:
2525
branches:
2626
- master
27-
- next
28-
- 1.8.0
27+
- release-v2-dev
2928
schedule:
3029
- cron: '25 5 * * 5'
3130

3231
jobs:
3332
changes:
34-
runs-on: ubuntu-latest
33+
runs-on: buildjet-2vcpu-ubuntu-2204
3534
outputs:
3635
go: ${{ steps.filter.outputs.go }}
3736
steps:

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

Lines changed: 147 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,147 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: Conformance Test
19+
20+
on:
21+
push:
22+
branches:
23+
- master
24+
- release-v2-dev
25+
pull_request:
26+
branches:
27+
- master
28+
- release-v2-dev
29+
30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
32+
cancel-in-progress: true
33+
34+
jobs:
35+
prepare:
36+
name: Prepare
37+
runs-on: buildjet-2vcpu-ubuntu-2204
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v4
41+
42+
- name: Setup Go Env
43+
id: go
44+
uses: actions/setup-go@v4
45+
with:
46+
go-version: "1.22"
47+
48+
- name: Install kind
49+
run: |
50+
go install sigs.k8s.io/[email protected]
51+
52+
- name: Install Helm
53+
run: |
54+
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
55+
chmod 700 get_helm.sh
56+
./get_helm.sh
57+
58+
conformance-test:
59+
timeout-minutes: 60
60+
needs:
61+
- prepare
62+
runs-on: buildjet-2vcpu-ubuntu-2204
63+
steps:
64+
- name: Checkout
65+
uses: actions/checkout@v4
66+
with:
67+
submodules: recursive
68+
69+
- name: Setup Go Env
70+
uses: actions/setup-go@v4
71+
with:
72+
go-version: "1.22"
73+
74+
- name: Login to Private Registry
75+
uses: docker/login-action@v1
76+
with:
77+
registry: hkccr.ccs.tencentyun.com
78+
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
79+
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
80+
81+
- name: Build images
82+
env:
83+
TAG: dev
84+
ARCH: amd64
85+
ENABLE_PROXY: "false"
86+
BASE_IMAGE_TAG: "debug"
87+
run: |
88+
echo "building images..."
89+
make build-image
90+
91+
- name: Launch Kind Cluster
92+
run: |
93+
make kind-up
94+
95+
- name: Install And Run Cloud Provider KIND
96+
run: |
97+
go install sigs.k8s.io/cloud-provider-kind@latest
98+
nohup cloud-provider-kind > /tmp/kind-loadbalancer.log 2>&1 &
99+
100+
- name: Install Gateway API And CRDs
101+
run: |
102+
make install
103+
104+
- name: Loading Docker Image to Kind Cluster
105+
run: |
106+
make kind-load-images
107+
108+
- name: Install API7EE3
109+
run: |
110+
make download-api7ee3-chart
111+
112+
- name: Run Conformance Test
113+
shell: bash
114+
env:
115+
API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
116+
continue-on-error: true
117+
run: |
118+
make conformance-test
119+
120+
- name: Get Logs from api7-ingress-controller
121+
shell: bash
122+
run: |
123+
export KUBECONFIG=/tmp/apisix-ingress-cluster.kubeconfig
124+
kubectl logs -n apisix-conformance-test -l app=apisix-ingress-controller
125+
126+
- name: Upload Gateway API Conformance Report
127+
if: ${{ github.event_name == 'push' }}
128+
uses: actions/upload-artifact@v4
129+
with:
130+
name: apisix-ingress-controller-conformance-report.yaml
131+
path: apisix-ingress-controller-conformance-report.yaml
132+
133+
- name: Format Conformance Test Report
134+
if: ${{ github.event_name == 'pull_request' }}
135+
run: |
136+
echo '# conformance test report' > report.md
137+
echo '```yaml' >> report.md
138+
cat apisix-ingress-controller-conformance-report.yaml >> report.md
139+
echo '```' >> report.md
140+
141+
- name: Report Conformance Test Result to PR Comment
142+
if: ${{ github.event_name == 'pull_request' }}
143+
uses: mshick/add-pr-comment@v2
144+
with:
145+
message-id: 'conformance-test-report'
146+
message-path: |
147+
report.md

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

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
name: E2E Test
19+
20+
on:
21+
push:
22+
branches:
23+
- master
24+
- release-v2-dev
25+
pull_request:
26+
branches:
27+
- master
28+
- release-v2-dev
29+
30+
concurrency:
31+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
32+
cancel-in-progress: true
33+
34+
jobs:
35+
prepare:
36+
name: Prepare
37+
runs-on: buildjet-2vcpu-ubuntu-2204
38+
steps:
39+
- name: Checkout
40+
uses: actions/checkout@v4
41+
42+
- name: Setup Go Env
43+
id: go
44+
uses: actions/setup-go@v4
45+
with:
46+
go-version: "1.22"
47+
48+
- name: Install kind
49+
run: |
50+
go install sigs.k8s.io/[email protected]
51+
52+
- name: Install Helm
53+
run: |
54+
curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3
55+
chmod 700 get_helm.sh
56+
./get_helm.sh
57+
58+
e2e-test:
59+
needs:
60+
- prepare
61+
runs-on: buildjet-2vcpu-ubuntu-2204
62+
steps:
63+
- name: Checkout
64+
uses: actions/checkout@v4
65+
with:
66+
submodules: recursive
67+
68+
- name: Setup Go Env
69+
uses: actions/setup-go@v4
70+
with:
71+
go-version: "1.22"
72+
73+
- name: Login to Private Registry
74+
uses: docker/login-action@v1
75+
with:
76+
registry: hkccr.ccs.tencentyun.com
77+
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
78+
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
79+
80+
- name: Build images
81+
env:
82+
TAG: dev
83+
ARCH: amd64
84+
ENABLE_PROXY: "false"
85+
BASE_IMAGE_TAG: "debug"
86+
run: |
87+
echo "building images..."
88+
make build-image
89+
90+
- name: Extract adc binary
91+
run: |
92+
echo "Extracting adc binary..."
93+
docker create --name adc-temp api7/api7-ingress-controller:dev
94+
docker cp adc-temp:/bin/adc /usr/local/bin/adc
95+
docker rm adc-temp
96+
chmod +x /usr/local/bin/adc
97+
echo "ADC binary extracted to /usr/local/bin/adc"
98+
99+
- name: Launch Kind Cluster
100+
run: |
101+
make kind-up
102+
103+
- name: Install Gateway API And CRDs
104+
run: |
105+
make install
106+
107+
- name: Download API7EE3 Chart
108+
run: |
109+
make download-api7ee3-chart
110+
111+
- name: Loading Docker Image to Kind Cluster
112+
run: |
113+
make kind-load-images
114+
115+
- name: Run E2E test suite
116+
shell: bash
117+
env:
118+
API7_EE_LICENSE: ${{ secrets.API7_EE_LICENSE }}
119+
PROVIDER_TYPE: api7ee
120+
run: |
121+
make e2e-test

‎.github/workflows/golangci-lint.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,11 @@ on:
2121
push:
2222
branches:
2323
- master
24-
- next
24+
- release-v2-dev
2525
pull_request:
2626
branches:
2727
- master
28-
- next
28+
- release-v2-dev
2929

3030
jobs:
3131
golangci:

0 commit comments

Comments
 (0)