Skip to content

Commit 301310d

Browse files
RevolyssupRevolyssup
authored
release: cherry pick commit and add changelog for release 1.8.4 (#2370)
1 parent 7980e30 commit 301310d

File tree

12 files changed

+206
-67
lines changed

12 files changed

+206
-67
lines changed

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ concurrency:
3434
jobs:
3535
changes:
3636
if: ${{ (!github.event.pull_request.draft && github.event.schedule == '0 0 * * *') }}
37-
runs-on: ubuntu-20.04
37+
runs-on: ubuntu-latest
3838
outputs:
3939
docs: ${{ steps.filter.outputs.docs }}
4040
go: ${{ steps.filter.outputs.go }}
@@ -65,7 +65,7 @@ jobs:
6565
- ".github/**"
6666
build:
6767
name: Build
68-
runs-on: ubuntu-20.04
68+
runs-on: ubuntu-latest
6969
needs: changes
7070
if: needs.changes.outputs.go == 'true'
7171

@@ -120,15 +120,15 @@ jobs:
120120
| pigz > docker-dev.tar.gz
121121
122122
- name: cache
123-
uses: actions/upload-artifact@v3
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: docker-dev.tar.gz
126126
path: docker-dev.tar.gz
127127

128128
prepare:
129129
needs: changes
130130
if: needs.changes.outputs.go == 'true'
131-
runs-on: ubuntu-20.04
131+
runs-on: ubuntu-latest
132132
steps:
133133
- uses: actions/checkout@v4
134134
with:
@@ -151,7 +151,7 @@ jobs:
151151
- changes
152152
- prepare
153153
- build
154-
runs-on: ubuntu-20.04
154+
runs-on: ubuntu-latest
155155
strategy:
156156
fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
157157
matrix:
@@ -173,7 +173,7 @@ jobs:
173173
sudo cp ~/go/bin/ginkgo /usr/local/bin
174174
175175
- name: cache
176-
uses: actions/download-artifact@v3
176+
uses: actions/download-artifact@v4
177177
with:
178178
name: docker-dev.tar.gz
179179

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ concurrency:
3333
jobs:
3434
changes:
3535
if: ${{ (!github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'area/test/apiv2')) || github.event.schedule == '0 0 * * *' }}
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-latest
3737
outputs:
3838
docs: ${{ steps.filter.outputs.docs }}
3939
go: ${{ steps.filter.outputs.go }}
@@ -64,7 +64,7 @@ jobs:
6464
- ".github/**"
6565
build:
6666
name: Build
67-
runs-on: ubuntu-20.04
67+
runs-on: ubuntu-latest
6868
needs: changes
6969
if: needs.changes.outputs.go == 'true'
7070

@@ -119,15 +119,15 @@ jobs:
119119
| pigz > docker-v2.tar.gz
120120
121121
- name: cache
122-
uses: actions/upload-artifact@v3
122+
uses: actions/upload-artifact@v4
123123
with:
124124
name: docker-v2.tar.gz
125125
path: docker-v2.tar.gz
126126

127127
prepare:
128128
needs: changes
129129
if: needs.changes.outputs.go == 'true'
130-
runs-on: ubuntu-20.04
130+
runs-on: ubuntu-latest
131131
steps:
132132
- uses: actions/checkout@v4
133133
with:
@@ -150,7 +150,7 @@ jobs:
150150
- changes
151151
- prepare
152152
- build
153-
runs-on: ubuntu-20.04
153+
runs-on: ubuntu-latest
154154
strategy:
155155
fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
156156
matrix:
@@ -172,7 +172,7 @@ jobs:
172172
sudo cp ~/go/bin/ginkgo /usr/local/bin
173173
174174
- name: cache
175-
uses: actions/download-artifact@v3
175+
uses: actions/download-artifact@v4
176176
with:
177177
name: docker-v2.tar.gz
178178

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ concurrency:
3333

3434
jobs:
3535
changes:
36-
runs-on: ubuntu-20.04
36+
runs-on: ubuntu-latest
3737
outputs:
3838
docs: ${{ steps.filter.outputs.docs }}
3939
go: ${{ steps.filter.outputs.go }}
@@ -64,7 +64,7 @@ jobs:
6464
- ".github/**"
6565
build:
6666
name: Build
67-
runs-on: ubuntu-20.04
67+
runs-on: ubuntu-latest
6868
needs: changes
6969
if: needs.changes.outputs.go == 'true'
7070

@@ -120,15 +120,15 @@ jobs:
120120
| pigz > docker.tar.gz
121121
122122
- name: cache
123-
uses: actions/upload-artifact@v3
123+
uses: actions/upload-artifact@v4
124124
with:
125125
name: docker.tar.gz
126126
path: docker.tar.gz
127127

128128
prepare:
129129
needs: changes
130130
if: needs.changes.outputs.go == 'true'
131-
runs-on: ubuntu-20.04
131+
runs-on: ubuntu-latest
132132
steps:
133133
- uses: actions/checkout@v4
134134
with:
@@ -151,7 +151,7 @@ jobs:
151151
- changes
152152
- prepare
153153
- build
154-
runs-on: ubuntu-20.04
154+
runs-on: ubuntu-latest
155155
strategy:
156156
fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
157157
matrix:
@@ -175,7 +175,7 @@ jobs:
175175
sudo cp ~/go/bin/ginkgo /usr/local/bin
176176
177177
- name: cache
178-
uses: actions/download-artifact@v3
178+
uses: actions/download-artifact@v4
179179
with:
180180
name: docker.tar.gz
181181

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ on:
2626

2727
jobs:
2828
changes:
29-
runs-on: ubuntu-20.04
29+
runs-on: ubuntu-latest
3030
outputs:
3131
docs: ${{ steps.filter.outputs.docs }}
3232
go: ${{ steps.filter.outputs.go }}
@@ -56,7 +56,7 @@ jobs:
5656
- 'utils/**'
5757
build:
5858
name: Build
59-
runs-on: ubuntu-20.04
59+
runs-on: ubuntu-latest
6060
needs: changes
6161

6262
steps:
@@ -109,15 +109,15 @@ jobs:
109109
| pigz > docker.tar.gz
110110
111111
- name: cache
112-
uses: actions/upload-artifact@v3
112+
uses: actions/upload-artifact@v4
113113
with:
114114
name: docker.tar.gz
115115
path: docker.tar.gz
116116

117117
prepare:
118118
needs: changes
119119
if: needs.changes.outputs.go == 'true'
120-
runs-on: ubuntu-20.04
120+
runs-on: ubuntu-latest
121121
steps:
122122
- uses: actions/checkout@v4
123123
with:
@@ -131,7 +131,7 @@ jobs:
131131
- changes
132132
- prepare
133133
- build
134-
runs-on: ubuntu-20.04
134+
runs-on: ubuntu-latest
135135
strategy:
136136
fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
137137
matrix:
@@ -157,7 +157,7 @@ jobs:
157157
sudo cp ~/go/bin/ginkgo /usr/local/bin
158158
159159
- name: cache
160-
uses: actions/download-artifact@v3
160+
uses: actions/download-artifact@v4
161161
with:
162162
name: docker.tar.gz
163163

‎CHANGELOG.md‎

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
# Table of Contents
2121

22+
- [1.8.4](#184)
2223
- [1.8.3](#182)
2324
- [1.8.2](#182)
2425
- [1.8.1](#181)
@@ -42,6 +43,21 @@
4243
- [0.2.0](#020)
4344
- [0.1.0](#010)
4445

46+
# 1.8.4
47+
48+
## What's New
49+
50+
- upgrade: etcd-adapter and add e2e test @Revolyssup (#2369)
51+
- chore: upgrade ubuntu from 20.04 to latest @Revolyssup (#2352)
52+
- chore: upgrade actions/upload-artifact and actions/download-artifact @nic-6443 (#2328)
53+
- docs: update http[].match.exprs any -> all @acuteaura (#2270)
54+
- fix: attempt to shut down when provider init fails @acuteaura (#2263)
55+
56+
## 👨🏽‍💻 Contributors
57+
58+
Thank you to our contributors for making this release possible:
59+
@Revolyssup, @acuteaura and @nic-6443
60+
4561
# 1.8.3
4662

4763
## What's New
@@ -53,7 +69,6 @@
5369
Thank you to our contributors for making this release possible:
5470
@Revolyssup
5571

56-
5772
# 1.8.2
5873

5974
## What's New
@@ -940,7 +955,7 @@ https://github.com/apache/apisix-ingress-controller/issues.
940955
* lsy
941956
* mango
942957
* Fatpa
943-
* Hoshea Jiang
958+
* Hoshea Jiang
944959
* JasonZhu
945960
* Yu.Bozhong
946961
* seven dickens
@@ -1234,7 +1249,7 @@ https://github.com/apache/apisix-ingress-controller/issues.
12341249
* lsy
12351250
* mango
12361251
* Fatpa
1237-
* Hoshea Jiang
1252+
* Hoshea Jiang
12381253
* JasonZhu
12391254
* Xin Rong
12401255
* Yu.Bozhong
@@ -1720,7 +1735,7 @@ Please try out the release binaries and report any issues at
17201735
### Contributors
17211736

17221737
* kv
1723-
* Hoshea Jiang
1738+
* Hoshea Jiang
17241739
* Jintao Zhang
17251740
* Sarasa Kisaragi
17261741
* Baoyuan
@@ -1798,7 +1813,7 @@ Please try out the release binaries and report any issues at
17981813
* kv
17991814
* Jintao Zhang
18001815
* Baoyuan
1801-
* Hoshea Jiang
1816+
* Hoshea Jiang
18021817
* chen zhuo
18031818
* okaybase
18041819
* yuanfeng0905

‎docs/en/latest/references/apisix_route_v2.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ The table below describes each of the attributes in the spec. The fields `apiVer
4848
| http[].match.hosts | array | List of hosts to match the Route with. The Route will be used if any one of the hosts is matched. |
4949
| http[].match.methods | array | List of HTTP methods (`GET`, `POST`, `PUT`, `DELETE`, `PATCH`, `HEAD`, `OPTIONS`, `CONNECT`, `TRACE`) to match the Route with. The Route will be used if any one of the methods is matched. |
5050
| http[].match.remoteAddrs | array | List of IP addresses (CIDR format) to match the Route with. The Route will be used if any one of the IP address is matched. |
51-
| http[].match.exprs | array | List of expressions to match the Route with. The Route will be used if any one of the expression is matched. |
51+
| http[].match.exprs | array | List of expressions to match the Route with. The Route will be used if all of the expressions are matched. |
5252
| http[].match.exprs[].subject | object | Subject for the expression. |
5353
| http[].match.exprs[].subject.scope | string | Scope of the subject. Can be one of `Header`, `Query`, `Cookie`, or `Path`. |
5454
| http[].match.exprs[].subject.name | string | Subject name. Can be empty when the scope is `Path`. |

‎go.mod‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ module github.com/apache/apisix-ingress-controller
33
go 1.20
44

55
require (
6-
github.com/api7/etcd-adapter v0.2.4
6+
github.com/api7/etcd-adapter v0.2.5
77
github.com/api7/gopkg v0.2.0
88
github.com/gin-gonic/gin v1.9.1
99
github.com/hashicorp/go-memdb v1.3.4

‎go.sum‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
22
cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
33
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
44
github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
5-
github.com/api7/etcd-adapter v0.2.4 h1:VWdDPUJPai5IdxV5dwwZF9e7Ilw7sBWwaEeFzPO2fV4=
6-
github.com/api7/etcd-adapter v0.2.4/go.mod h1:JoLtq4IxiIw6Z+k9eRGHL0CDyfRvnNXGI0skV0EsSE8=
5+
github.com/api7/etcd-adapter v0.2.5 h1:uyXqDsIaI39I/1AT9/7iKSGU8icsKhpuOHFb17wkvJE=
6+
github.com/api7/etcd-adapter v0.2.5/go.mod h1:JoLtq4IxiIw6Z+k9eRGHL0CDyfRvnNXGI0skV0EsSE8=
77
github.com/api7/gopkg v0.2.0 h1:+5vw6Rt9IeEpJoL2JMZFDwGDhH4aaeUJize21/3Qdzc=
88
github.com/api7/gopkg v0.2.0/go.mod h1:LlplmjGCrkcS3nyCYpTwkdLkuNlYRYAnI8XH1qwsICw=
99
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=

0 commit comments

Comments
 (0)