release: cherry pick commit and add changelog for release 1.8.4

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

@@ -34,7 +34,7 @@ concurrency:
 jobs:
   changes:
     if: ${{ (!github.event.pull_request.draft && github.event.schedule == '0 0 * * *') }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
       go: ${{ steps.filter.outputs.go }}
@@ -65,7 +65,7 @@ jobs:
               - ".github/**"
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: changes
     if: needs.changes.outputs.go == 'true'
 
@@ -120,15 +120,15 @@ jobs:
             | pigz > docker-dev.tar.gz
 
       - name: cache
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-dev.tar.gz
           path: docker-dev.tar.gz
 
   prepare:
     needs: changes
     if: needs.changes.outputs.go == 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -151,7 +151,7 @@ jobs:
       - changes
       - prepare
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
       matrix:
@@ -173,7 +173,7 @@ jobs:
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker-dev.tar.gz
 

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

@@ -33,7 +33,7 @@ concurrency:
 jobs:
   changes:
     if: ${{ (!github.event.pull_request.draft && contains(github.event.pull_request.labels.*.name, 'area/test/apiv2')) || github.event.schedule == '0 0 * * *' }}
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
       go: ${{ steps.filter.outputs.go }}
@@ -64,7 +64,7 @@ jobs:
               - ".github/**"
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: changes
     if: needs.changes.outputs.go == 'true'
 
@@ -119,15 +119,15 @@ jobs:
             | pigz > docker-v2.tar.gz
 
       - name: cache
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker-v2.tar.gz
           path: docker-v2.tar.gz
 
   prepare:
     needs: changes
     if: needs.changes.outputs.go == 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -150,7 +150,7 @@ jobs:
       - changes
       - prepare
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
       matrix:
@@ -172,7 +172,7 @@ jobs:
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker-v2.tar.gz
 

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

@@ -33,7 +33,7 @@ concurrency:
 
 jobs:
   changes:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
       go: ${{ steps.filter.outputs.go }}
@@ -64,7 +64,7 @@ jobs:
               - ".github/**"
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: changes
     if: needs.changes.outputs.go == 'true'
 
@@ -120,15 +120,15 @@ jobs:
             | pigz > docker.tar.gz
 
       - name: cache
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker.tar.gz
           path: docker.tar.gz
 
   prepare:
     needs: changes
     if: needs.changes.outputs.go == 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -151,7 +151,7 @@ jobs:
       - changes
       - prepare
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
       matrix:
@@ -175,7 +175,7 @@ jobs:
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker.tar.gz
 

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

@@ -26,7 +26,7 @@ on:
 
 jobs:
   changes:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       docs: ${{ steps.filter.outputs.docs }}
       go: ${{ steps.filter.outputs.go }}
@@ -56,7 +56,7 @@ jobs:
               - 'utils/**'
   build:
     name: Build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     needs: changes
 
     steps:
@@ -109,15 +109,15 @@ jobs:
             | pigz > docker.tar.gz
 
       - name: cache
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: docker.tar.gz
           path: docker.tar.gz
 
   prepare:
     needs: changes
     if: needs.changes.outputs.go == 'true'
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
         with:
@@ -131,7 +131,7 @@ jobs:
       - changes
       - prepare
       - build
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: false # If false, GitHub will not cancels all in-progress jobs in the matrix if any matrix job fails.
       matrix:
@@ -157,7 +157,7 @@ jobs:
           sudo cp ~/go/bin/ginkgo /usr/local/bin
 
       - name: cache
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: docker.tar.gz
 

CHANGELOG.md

@@ -19,6 +19,7 @@
 
 # Table of Contents
 
+- [1.8.4](#184)
 - [1.8.3](#182)
 - [1.8.2](#182)
 - [1.8.1](#181)
@@ -42,6 +43,21 @@
 - [0.2.0](#020)
 - [0.1.0](#010)
 
+# 1.8.4
+
+## What's New
+
+- upgrade: etcd-adapter and add e2e test @Revolyssup (#2369)
+- chore: upgrade ubuntu from 20.04 to latest @Revolyssup (#2352)
+- chore: upgrade actions/upload-artifact and actions/download-artifact @nic-6443 (#2328)
+- docs: update http[].match.exprs any -> all @acuteaura (#2270)
+- fix: attempt to shut down when provider init fails @acuteaura (#2263)
+
+## 👨🏽‍💻 Contributors
+
+Thank you to our contributors for making this release possible:
+@Revolyssup, @acuteaura and @nic-6443
+
 # 1.8.3
 
 ## What's New
@@ -53,7 +69,6 @@
 Thank you to our contributors for making this release possible:
 @Revolyssup
 
-
 # 1.8.2
 
 ## What's New
@@ -940,7 +955,7 @@ https://github.com/apache/apisix-ingress-controller/issues.
 * lsy
 * mango
 * Fatpa
-* Hoshea Jiang
+* Hoshea Jiang
 * JasonZhu
 * Yu.Bozhong
 * seven dickens
@@ -1234,7 +1249,7 @@ https://github.com/apache/apisix-ingress-controller/issues.
 * lsy
 * mango
 * Fatpa
-* Hoshea Jiang
+* Hoshea Jiang
 * JasonZhu
 * Xin Rong
 * Yu.Bozhong
@@ -1720,7 +1735,7 @@ Please try out the release binaries and report any issues at
 ### Contributors
 
 * kv
-* Hoshea Jiang
+* Hoshea Jiang
 * Jintao Zhang
 * Sarasa Kisaragi
 * Baoyuan
@@ -1798,7 +1813,7 @@ Please try out the release binaries and report any issues at
 * kv
 * Jintao Zhang
 * Baoyuan
-* Hoshea Jiang
+* Hoshea Jiang
 * chen zhuo
 * okaybase
 * yuanfeng0905

docs/en/latest/references/apisix_route_v2.md

@@ -48,7 +48,7 @@ The table below describes each of the attributes in the spec. The fields `apiVer
 | 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.                                                                                         |
 | 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. |
 | 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.                                                               |
-| 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.                                                                              |
+| http[].match.exprs                   | array              | List of expressions to match the Route with. The Route will be used if all of the expressions are matched.                                                                              |
 | http[].match.exprs[].subject         | object             | Subject for the expression.                                                                                                                                                               |
 | http[].match.exprs[].subject.scope   | string             | Scope of the subject. Can be one of `Header`, `Query`, `Cookie`, or `Path`.                                                                                                               |
 | http[].match.exprs[].subject.name    | string             | Subject name. Can be empty when the scope is `Path`.                                                                                                                                      |

go.mod

@@ -3,7 +3,7 @@ module github.com/apache/apisix-ingress-controller
 go 1.20
 
 require (
-	github.com/api7/etcd-adapter v0.2.4
+	github.com/api7/etcd-adapter v0.2.5
 	github.com/api7/gopkg v0.2.0
 	github.com/gin-gonic/gin v1.9.1
 	github.com/hashicorp/go-memdb v1.3.4

go.sum

@@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/api7/etcd-adapter v0.2.4 h1:VWdDPUJPai5IdxV5dwwZF9e7Ilw7sBWwaEeFzPO2fV4=
-github.com/api7/etcd-adapter v0.2.4/go.mod h1:JoLtq4IxiIw6Z+k9eRGHL0CDyfRvnNXGI0skV0EsSE8=
+github.com/api7/etcd-adapter v0.2.5 h1:uyXqDsIaI39I/1AT9/7iKSGU8icsKhpuOHFb17wkvJE=
+github.com/api7/etcd-adapter v0.2.5/go.mod h1:JoLtq4IxiIw6Z+k9eRGHL0CDyfRvnNXGI0skV0EsSE8=
 github.com/api7/gopkg v0.2.0 h1:+5vw6Rt9IeEpJoL2JMZFDwGDhH4aaeUJize21/3Qdzc=
 github.com/api7/gopkg v0.2.0/go.mod h1:LlplmjGCrkcS3nyCYpTwkdLkuNlYRYAnI8XH1qwsICw=
 github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=