Skip to content

Commit d2eb8d1

Browse files
Revolyssupnic-6443
Revolyssup
and
nic-6443
authored
refactor api calls to make compatible with dashboard (#12)
Feat: Refactor ingress controller to make compatible with dashboard API --------- Signed-off-by: Ashish Tiwari <[email protected]> Signed-off-by: Nic <[email protected]> Co-authored-by: Nic <[email protected]>
1 parent 265cd7c commit d2eb8d1

File tree

284 files changed

+7505
-8704
lines changed

Some content is hidden

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

284 files changed

+7505
-8704
lines changed

‎.github/ISSUE_TEMPLATE/bug_report.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
Prior to opening the issue, please make sure that you:
1313
1414
- Use English to communicate.
15-
- Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
15+
- Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
1616
1717
- type: textarea
1818
id: current-behavior
@@ -56,7 +56,7 @@ body:
5656
label: Environment
5757
description: Share your environment details. Reports without proper environment details will likely be closed.
5858
value: |
59-
- APISIX Ingress controller version (run `apisix-ingress-controller version --long`)
59+
- APISIX Ingress controller version (run `api7-ingress-controller version --long`)
6060
- Kubernetes cluster version (run `kubectl version`)
6161
- OS version if running APISIX Ingress controller in a bare-metal environment (run `uname -a`)
6262
validations:

‎.github/ISSUE_TEMPLATE/feature_request.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ body:
1010
Prior to opening the issue, please make sure that you:
1111
1212
- Use English to communicate.
13-
- Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
13+
- Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
1414
1515
- type: textarea
1616
id: description

‎.github/ISSUE_TEMPLATE/improve_docs.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ body:
1111
Prior to opening the issue, please make sure that you:
1212
1313
- Use English to communicate.
14-
- Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
14+
- Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
1515
1616
- type: textarea
1717
id: current-state

‎.github/ISSUE_TEMPLATE/performance_issue.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ body:
1212
Prior to opening the issue, please make sure that you:
1313
1414
- Use English to communicate.
15-
- Search the [open issues](https://github.com/apache/apisix-ingress-controller/issues) to avoid duplicating the issue.
15+
- Search the [open issues](https://github.com/apache/api7-ingress-controller/issues) to avoid duplicating the issue.
1616
- type: textarea
1717
id: issue-faced
1818
attributes:
@@ -46,7 +46,7 @@ body:
4646
label: Environment
4747
description: Share your environment details. Reports without proper environment details will likely be closed.
4848
value: |
49-
- APISIX Ingress controller version (run `apisix-ingress-controller version --long`)
49+
- APISIX Ingress controller version (run `api7-ingress-controller version --long`)
5050
- Kubernetes cluster version (run `kubectl version`)
5151
- OS version if running APISIX Ingress controller in a bare-metal environment (run `uname -a`)
5252
validations:

‎.github/ISSUE_TEMPLATE/request_help.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ body:
2424
label: Environment
2525
description: Request help without environment information will be ignored or closed.
2626
value: |
27-
- your apisix-ingress-controller version (output of apisix-ingress-controller version --long):
27+
- your api7-ingress-controller version (output of api7-ingress-controller version --long):
2828
- your Kubernetes cluster version (output of kubectl version):
29-
- if you run apisix-ingress-controller in Bare-metal environment, also show your OS version (uname -a):
29+
- if you run api7-ingress-controller in Bare-metal environment, also show your OS version (uname -a):
3030
validations:
3131
required: true

‎.github/PULL_REQUEST_TEMPLATE

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ Please follow the requirements:
3434
- [ ] Did you explain what problem does this PR solve? Or what new features have been added?
3535
- [ ] Have you added corresponding test cases?
3636
- [ ] Have you modified the corresponding document?
37-
- [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/apisix-ingress-controller#community) first**
37+
- [ ] Is this PR backward compatible? **If it is not backward compatible, please discuss on the [mailing list](https://github.com/apache/api7-ingress-controller#community) first**

‎.github/workflows/docker-push.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ on:
3232

3333
jobs:
3434
docker:
35-
runs-on: buildjet-2vcpu-ubuntu-2204
35+
runs-on: ubuntu-20.04
3636
steps:
3737
-
3838
name: Checkout

‎.github/workflows/e2e-test-ci-v2-cron-dev.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
id: go
7979
uses: actions/setup-go@v4
8080
with:
81-
go-version: '1.20'
81+
go-version: '1.21'
8282

8383
- name: Set up QEMU
8484
uses: docker/setup-qemu-action@v3
@@ -111,8 +111,9 @@ jobs:
111111
docker save \
112112
${REGISTRY}/apisix:dev \
113113
${REGISTRY}/etcd:dev \
114-
${REGISTRY}/apisix-ingress-controller:dev \
115-
${REGISTRY}/httpbin:dev \
114+
${REGISTRY}/api7-ingress-controller:dev \
115+
$(REGISTRY)/httpbin:dev \
116+
$(REGISTRY)/mockbin:dev \
116117
${REGISTRY}/test-backend:dev \
117118
${REGISTRY}/test-timeout:dev \
118119
${REGISTRY}/echo-server:dev \
@@ -164,7 +165,7 @@ jobs:
164165
- name: Setup Go Env
165166
uses: actions/setup-go@v4
166167
with:
167-
go-version: "1.20"
168+
go-version: "1.21"
168169

169170
- name: Install ginkgo
170171
run: |
@@ -177,6 +178,14 @@ jobs:
177178
with:
178179
name: docker-dev.tar.gz
179180

181+
-
182+
name: Login to Private Registry
183+
uses: docker/login-action@v3
184+
with:
185+
registry: hkccr.ccs.tencentyun.com
186+
username: 100033089146
187+
password: "{e>rw2[#EDAD"
188+
180189
- name: Create K8s cluster
181190
shell: bash
182191
run: |

‎.github/workflows/e2e-test-ci-v2-cron.yml

+13-4
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ jobs:
7777
id: go
7878
uses: actions/setup-go@v4
7979
with:
80-
go-version: '1.20'
80+
go-version: '1.21'
8181

8282
- name: Set up QEMU
8383
uses: docker/setup-qemu-action@v3
@@ -110,8 +110,9 @@ jobs:
110110
docker save \
111111
${REGISTRY}/apisix:dev \
112112
${REGISTRY}/etcd:dev \
113-
${REGISTRY}/apisix-ingress-controller:dev \
114-
${REGISTRY}/httpbin:dev \
113+
${REGISTRY}/api7-ingress-controller:dev \
114+
$(REGISTRY)/httpbin:dev \
115+
$(REGISTRY)/mockbin:dev \
115116
${REGISTRY}/test-backend:dev \
116117
${REGISTRY}/test-timeout:dev \
117118
${REGISTRY}/echo-server:dev \
@@ -163,7 +164,7 @@ jobs:
163164
- name: Setup Go Env
164165
uses: actions/setup-go@v4
165166
with:
166-
go-version: "1.20"
167+
go-version: "1.21"
167168

168169
- name: Install ginkgo
169170
run: |
@@ -176,6 +177,14 @@ jobs:
176177
with:
177178
name: docker-v2.tar.gz
178179

180+
-
181+
name: Login to Private Registry
182+
uses: docker/login-action@v3
183+
with:
184+
registry: hkccr.ccs.tencentyun.com
185+
username: 100033089146
186+
password: "{e>rw2[#EDAD"
187+
179188
- name: Create K8s cluster
180189
shell: bash
181190
run: |

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

+21-6
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
- ".github/**"
4848
build:
4949
name: Build
50-
runs-on: buildjet-2vcpu-ubuntu-2204
50+
runs-on: ubuntu-20.04
5151
needs: changes
5252
if: needs.changes.outputs.go == 'true'
5353
steps:
@@ -59,7 +59,7 @@ jobs:
5959
id: go
6060
uses: actions/setup-go@v4
6161
with:
62-
go-version: '1.20'
62+
go-version: '1.21'
6363

6464
- name: Set up QEMU
6565
uses: docker/setup-qemu-action@v3
@@ -70,6 +70,12 @@ jobs:
7070
with:
7171
version: latest
7272

73+
- name: Login to Private Registry
74+
uses: docker/login-action@v1
75+
with:
76+
registry: ${{ secrets.PRIVATE_DOCKER_REGISTRY }}
77+
username: ${{ secrets.PRIVATE_DOCKER_USERNAME }}
78+
password: ${{ secrets.PRIVATE_DOCKER_PASSWORD }}
7379
- name: Prepare Host
7480
run: |
7581
curl -Lo ./kind https://kind.sigs.k8s.io/dl/v0.11.1/kind-linux-amd64
@@ -91,10 +97,11 @@ jobs:
9197
9298
echo "creating images cache..."
9399
docker save \
94-
${REGISTRY}/apisix:dev \
100+
${REGISTRY}/hkccr.ccs.tencentyun.com/api7-dev/api7-ee-3-gateway:dev \
95101
${REGISTRY}/etcd:dev \
96-
${REGISTRY}/apisix-ingress-controller:dev \
102+
${REGISTRY}/api7-ingress-controller:dev \
97103
${REGISTRY}/httpbin:dev \
104+
${REGISTRY}/mockbin:dev \
98105
${REGISTRY}/test-backend:dev \
99106
${REGISTRY}/test-timeout:dev \
100107
${REGISTRY}/echo-server:dev \
@@ -133,7 +140,7 @@ jobs:
133140
- changes
134141
- prepare
135142
- build
136-
runs-on: buildjet-2vcpu-ubuntu-2204
143+
runs-on: ubuntu-20.04
137144
strategy:
138145
fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
139146
matrix:
@@ -148,7 +155,7 @@ jobs:
148155
- name: Setup Go Env
149156
uses: actions/setup-go@v4
150157
with:
151-
go-version: "1.20"
158+
go-version: "1.21"
152159

153160
- name: Install ginkgo
154161
run: |
@@ -161,6 +168,14 @@ jobs:
161168
with:
162169
name: docker.tar.gz
163170

171+
-
172+
name: Login to Private Registry
173+
uses: docker/login-action@v3
174+
with:
175+
registry: hkccr.ccs.tencentyun.com
176+
username: 100033089146
177+
password: "{e>rw2[#EDAD"
178+
164179
- name: Create K8s cluster
165180
shell: bash
166181
run: |

‎.github/workflows/goimports-reviser.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Setup Go Env
6868
uses: actions/setup-go@v4
6969
with:
70-
go-version: "1.20"
70+
go-version: "1.21"
7171
- name: Make update-gofmt
7272
working-directory: ./
7373
run: |

‎.github/workflows/golangci-lint.yml

+5-2
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,16 @@ jobs:
6363
needs: changes
6464
if: |
6565
(needs.changes.outputs.go == 'true')
66-
runs-on: buildjet-2vcpu-ubuntu-2204
66+
runs-on: ubuntu-latest
6767
steps:
6868
- uses: actions/checkout@v4
6969
- name: Setup Go Env
7070
uses: actions/setup-go@v4
7171
with:
72-
go-version: '1.20'
72+
go-version: '1.21.0'
73+
74+
- name: check go path for debug
75+
run: go env
7376

7477
- name: Download golangci-lint
7578
run: curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.52.2

‎.github/workflows/k8s-timer-ci.yml

+5-4
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
id: go
6969
uses: actions/setup-go@v4
7070
with:
71-
go-version: '1.20'
71+
go-version: '1.21'
7272

7373
- name: Set up QEMU
7474
uses: docker/setup-qemu-action@v3
@@ -100,8 +100,9 @@ jobs:
100100
docker save \
101101
${REGISTRY}/apisix:dev \
102102
${REGISTRY}/etcd:dev \
103-
${REGISTRY}/apisix-ingress-controller:dev \
104-
${REGISTRY}/httpbin:dev \
103+
${REGISTRY}/api7-ingress-controller:dev \
104+
$(REGISTRY)/httpbin:dev \
105+
$(REGISTRY)/mockbin:dev \
105106
${REGISTRY}/test-backend:dev \
106107
${REGISTRY}/test-timeout:dev \
107108
${REGISTRY}/echo-server:dev \
@@ -148,7 +149,7 @@ jobs:
148149
- name: Setup Go Env
149150
uses: actions/setup-go@v4
150151
with:
151-
go-version: "1.20"
152+
go-version: "1.21"
152153

153154
- name: Install ginkgo
154155
run: |

‎.github/workflows/lint-checker.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup Go Env
6969
uses: actions/setup-go@v4
7070
with:
71-
go-version: '1.20'
71+
go-version: '1.21'
7272
- name: run gofmt
7373
working-directory: ./
7474
run: |

‎.github/workflows/unit-test-ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
- name: Setup Go Env
6969
uses: actions/setup-go@v4
7070
with:
71-
go-version: "1.20"
71+
go-version: "1.21"
7272
- name: Run unit test
7373
working-directory: ./
7474
run: |

‎.github/workflows/verify-codegen.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ jobs:
6767
- name: Setup Go Env
6868
uses: actions/setup-go@v4
6969
with:
70-
go-version: "1.20"
70+
go-version: "1.21"
7171
- name: Make verify-codegen
7272
working-directory: ./
7373
run: |

‎.gitignore

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ vendor/
3939
.DS_Store
4040
coverage.txt
4141
test/e2e/coverage.txt
42-
apisix-ingress-controller
42+
api7-ingress-controller
4343
.actions/openwhisk-utilities
44-
44+
docker-compose/postgresql_data/
4545
.generated

0 commit comments

Comments
 (0)