This is an automated email from the ASF dual-hosted git repository.
spacewander pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/apisix.git
The following commit(s) were added to refs/heads/master by this push:
new 709561a feat: release 2.6 (#4286)
709561a is described below
commit 709561afe7f7a236d5e713a8961c87ef0adca695
Author: 罗泽轩 <[email protected]>
AuthorDate: Mon May 24 19:26:14 2021 +0800
feat: release 2.6 (#4286)
---
CHANGELOG.md | 36 +++++++++++++++++
README.md | 8 ++--
apisix/core/version.lua | 2 +-
docs/ar/README.md | 8 ++--
docs/en/latest/config.json | 2 +-
docs/en/latest/how-to-build.md | 10 ++---
docs/es/latest/README.md | 8 ++--
docs/es/latest/config.json | 2 +-
docs/zh/latest/CHANGELOG.md | 36 +++++++++++++++++
docs/zh/latest/README.md | 8 ++--
docs/zh/latest/config.json | 2 +-
docs/zh/latest/how-to-build.md | 10 ++---
rockspec/apisix-2.6-0.rockspec | 91 ++++++++++++++++++++++++++++++++++++++++++
13 files changed, 193 insertions(+), 30 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65090d7..e5a7329 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -23,6 +23,7 @@ title: Changelog
## Table of Contents
+- [2.6.0](#260)
- [2.5.0](#250)
- [2.4.0](#240)
- [2.3.0](#230)
@@ -41,6 +42,41 @@ title: Changelog
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.6.0
+
+### Change
+
+- change(prometheus): redesign the latency metrics & update grafana
[#3993](https://github.com/apache/apisix/pull/3993)
+- change(prometheus): don't expose metrics to internet
[#3994](https://github.com/apache/apisix/pull/3994)
+- change(limit-count): ensure redis cluster name is set correctly
[#3910](https://github.com/apache/apisix/pull/3910)
+- change: drop support of OpenResty 1.15
[#3960](https://github.com/apache/apisix/pull/3960)
+
+### Core
+
+- :sunrise: feat: support passing different host headers in multiple nodes
[#4208](https://github.com/apache/apisix/pull/4208)
+- :sunrise: feat: add 50x html for error page
[#4164](https://github.com/apache/apisix/pull/4164)
+- :sunrise: feat: support to use upstream_id in stream_route
[#4121](https://github.com/apache/apisix/pull/4121)
+- :sunrise: feat: support client certificate verification
[#4034](https://github.com/apache/apisix/pull/4034)
+- :sunrise: feat: add nacos support
[#3820](https://github.com/apache/apisix/pull/3820)
+- :sunrise: feat: patch tcp.sock.connect to use our DNS resolver
[#4114](https://github.com/apache/apisix/pull/4114)
+
+### Plugin
+
+- :sunrise: feat(redirect): support uri encoding
[#4244](https://github.com/apache/apisix/pull/4244)
+- :sunrise: feat(key-auth): allow customizing header
[#4013](https://github.com/apache/apisix/pull/4013)
+- :sunrise: feat(response-rewrite): allow using variable in the header
[#4194](https://github.com/apache/apisix/pull/4194)
+- :sunrise: feat(ext-plugin): APISIX can support Java, Go and other languages
to implement custom plugin [#4183](https://github.com/apache/apisix/pull/4183)
+
+### Bugfix
+
+- fix(DNS): support IPv6 resolver
[#4242](https://github.com/apache/apisix/pull/4242)
+- fix(healthcheck): only one_loop is needed in the passive health check report
[#4116](https://github.com/apache/apisix/pull/4116)
+- fix(traffic-split): configure multiple "rules", the request will be confused
between upstream [#4092](https://github.com/apache/apisix/pull/4092)
+- fix: ensure upstream with domain is cached
[#4061](https://github.com/apache/apisix/pull/4061)
+- fix: be compatible with the router created before 2.5
[#4056](https://github.com/apache/apisix/pull/4056)
+- fix(standalone): the conf should be available during start
[#4027](https://github.com/apache/apisix/pull/4027)
+- fix: ensure atomic operation in limit-count plugin
[#3991](https://github.com/apache/apisix/pull/3991)
+
## 2.5.0
**The changes marked with :warning: are not backward compatible.**
diff --git a/README.md b/README.md
index f85b6d7..02d08e1 100644
--- a/README.md
+++ b/README.md
@@ -153,9 +153,9 @@ There are several ways to install the Apache Release
version of APISIX:
- Download the latest source code release package:
```shell
- $ mkdir apisix-2.5
- $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
- $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+ $ mkdir apisix-2.6
+ $ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+ $ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
- Install the dependencies：
@@ -192,7 +192,7 @@ There are several ways to install the Apache Release
version of APISIX:
- install APISIX：
```shell
- $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+ $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
- check the version of APISIX:
diff --git a/apisix/core/version.lua b/apisix/core/version.lua
index d7dd13b..05e6a95 100644
--- a/apisix/core/version.lua
+++ b/apisix/core/version.lua
@@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
- VERSION = "2.5"
+ VERSION = "2.6"
}
diff --git a/docs/ar/README.md b/docs/ar/README.md
index 3c311e0..c2ac6b0 100644
--- a/docs/ar/README.md
+++ b/docs/ar/README.md
@@ -158,9 +158,9 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10,
macOS, **ARM64** Ubun
- قم بتنزيل أحدث حزمة إصدار لشفرة المصدر:
```shell
- $ mkdir apisix-2.5
- $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
- $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+ $ mkdir apisix-2.6
+ $ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+ $ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
- تثبيت التبعيات ：
@@ -197,7 +197,7 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10,
macOS, **ARM64** Ubun
- تثبيت أبيسكس：
```shell
- $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+ $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
- تحقق من إصدار أبيسكس:
diff --git a/docs/en/latest/config.json b/docs/en/latest/config.json
index f45819a..aec85b6 100644
--- a/docs/en/latest/config.json
+++ b/docs/en/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": 2.5,
+ "version": 2.6,
"sidebar": [
{
"type": "link",
diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md
index 6dd3d51..12cc0e0 100644
--- a/docs/en/latest/how-to-build.md
+++ b/docs/en/latest/how-to-build.md
@@ -34,7 +34,7 @@ You can install Apache APISIX in a variety of ways, including
source code packag
### Installation via RPM package (CentOS 7)
```shell
-sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
### Installation via Docker
@@ -50,15 +50,15 @@ See https://github.com/apache/apisix-helm-chart
You need to download the Apache source release first:
```shell
-$ mkdir apisix-2.5
-$ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
-$ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+$ mkdir apisix-2.6
+$ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+$ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
Install the Lua libraries that the runtime depends on:
```shell
-cd apisix-2.5
+cd apisix-2.6
make deps
```
diff --git a/docs/es/latest/README.md b/docs/es/latest/README.md
index 975bc7c..9f2d086 100644
--- a/docs/es/latest/README.md
+++ b/docs/es/latest/README.md
@@ -155,9 +155,9 @@ Hay varias maneras de instalar la versión publicada Apache
de APISIX:
- Bajar el paquete de publicación más reciente de código fuente:
```shell
- $ mkdir apisix-2.5
- $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
- $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+ $ mkdir apisix-2.6
+ $ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+ $ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
- Instalar las dependencias：
@@ -194,7 +194,7 @@ Hay varias maneras de instalar la versión publicada Apache
de APISIX:
- Instalar APISIX：
```shell
- $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+ $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
- Chequear versión de APISIX:
diff --git a/docs/es/latest/config.json b/docs/es/latest/config.json
index 71755ac..f02749c 100644
--- a/docs/es/latest/config.json
+++ b/docs/es/latest/config.json
@@ -1,4 +1,4 @@
{
- "version": 2.5,
+ "version": 2.6,
"sidebar": []
}
diff --git a/docs/zh/latest/CHANGELOG.md b/docs/zh/latest/CHANGELOG.md
index e5d97fc..eda88b9 100644
--- a/docs/zh/latest/CHANGELOG.md
+++ b/docs/zh/latest/CHANGELOG.md
@@ -23,6 +23,7 @@ title: CHANGELOG
## Table of Contents
+- [2.6.0](#260)
- [2.5.0](#250)
- [2.4.0](#240)
- [2.3.0](#230)
@@ -41,6 +42,41 @@ title: CHANGELOG
- [0.7.0](#070)
- [0.6.0](#060)
+## 2.6.0
+
+### Change
+
+- 更改 prometheus 里面关于 latency 的指标的 label
[#3993](https://github.com/apache/apisix/pull/3993)
+- 修改 prometheus 默认端口，不再暴露到数据面的端口上
[#3994](https://github.com/apache/apisix/pull/3994)
+- limit-count 里面如果使用 redis cluster，需要指定名称
[#3910](https://github.com/apache/apisix/pull/3910)
+- 不再支持 OpenResty 1.15 [#3960](https://github.com/apache/apisix/pull/3960)
+
+### Core
+
+- :sunrise: 允许 paas_host 为 node 时，upstream 配置多个节点
[#4208](https://github.com/apache/apisix/pull/4208)
+- :sunrise: 自定义 500 错误页 [#4164](https://github.com/apache/apisix/pull/4164)
+- :sunrise: stream_route 中支持 upstream_id
[#4121](https://github.com/apache/apisix/pull/4121)
+- :sunrise: 支持客户端证书认证 [#4034](https://github.com/apache/apisix/pull/4034)
+- :sunrise: 实验性支持 nacos 服务发现
[#3820](https://github.com/apache/apisix/pull/3820)
+- :sunrise: 给 tcp.sock.connect 打补丁，采用配置的 DNS resolver
[#4114](https://github.com/apache/apisix/pull/4114)
+
+### Plugin
+
+- :sunrise: redirect 插件，支持编码 uri
[#4244](https://github.com/apache/apisix/pull/4244)
+- :sunrise: key-auth 插件: 支持自定义鉴权头
[#4013](https://github.com/apache/apisix/pull/4013)
+- :sunrise: response-rewrite 插件: 允许在 header 里面使用变量
[#4194](https://github.com/apache/apisix/pull/4194)
+- :sunrise: 实现 ext-plugin 第一版，APISIX 现在支持使用其他语言编写自定义插件
[#4183](https://github.com/apache/apisix/pull/4183)
+
+### Bugfix
+
+- 支持 IPv6 DNS resolver [#4242](https://github.com/apache/apisix/pull/4242)
+- 修复被动健康检查可能重复报告的问题 [#4116](https://github.com/apache/apisix/pull/4116)
+- 修复 traffic-split 中偶发的规则紊乱 [#4092](https://github.com/apache/apisix/pull/4092)
+- 修复带域名的 upstream 配置的访问问题 [#4061](https://github.com/apache/apisix/pull/4061)
+- 修复 2.5 版本的 APISIX 无法识别之前版本的 route 配置的问题
[#4056](https://github.com/apache/apisix/pull/4056)
+- standalone 模式下，启动程序时应该可以读取配置
[#4027](https://github.com/apache/apisix/pull/4027)
+- limit-count 插件 redis 模式下原子化计数操作
[#3991](https://github.com/apache/apisix/pull/3991)
+
## 2.5.0
### Change
diff --git a/docs/zh/latest/README.md b/docs/zh/latest/README.md
index d2fc1ac..d69a2ba 100644
--- a/docs/zh/latest/README.md
+++ b/docs/zh/latest/README.md
@@ -157,9 +157,9 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10,
macOS, **ARM64** Ubun
- 下载最新的源码发布包：
```shell
- $ mkdir apisix-2.5
- $ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
- $ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+ $ mkdir apisix-2.6
+ $ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+ $ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
- 安装运行时依赖的 Lua 库：
@@ -196,7 +196,7 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10,
macOS, **ARM64** Ubun
- 安装 APISIX：
```shell
- $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+ $ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
- 检查 APISIX 的版本号：
diff --git a/docs/zh/latest/config.json b/docs/zh/latest/config.json
index b040826..1d60963 100644
--- a/docs/zh/latest/config.json
+++ b/docs/zh/latest/config.json
@@ -1,5 +1,5 @@
{
- "version": 2.5,
+ "version": 2.6,
"sidebar": [
{
"type": "category",
diff --git a/docs/zh/latest/how-to-build.md b/docs/zh/latest/how-to-build.md
index b2060cd..74373e9 100644
--- a/docs/zh/latest/how-to-build.md
+++ b/docs/zh/latest/how-to-build.md
@@ -34,7 +34,7 @@ Apache APISIX 的运行环境需要 Nginx 和 etcd，
### 通过 RPM 包安装（CentOS 7）
```shell
-sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisix-2.5-0.x86_64.rpm
+sudo yum install -y
https://github.com/apache/apisix/releases/download/2.6/apisix-2.6-0.x86_64.rpm
```
### 通过 Docker 安装
@@ -50,15 +50,15 @@ sudo yum install -y
https://github.com/apache/apisix/releases/download/2.5/apisi
你需要先下载 Apache Release 源码包：
```shell
-$ mkdir apisix-2.5
-$ wget https://downloads.apache.org/apisix/2.5/apache-apisix-2.5-src.tgz
-$ tar zxvf apache-apisix-2.5-src.tgz -C apisix-2.5
+$ mkdir apisix-2.6
+$ wget https://downloads.apache.org/apisix/2.6/apache-apisix-2.6-src.tgz
+$ tar zxvf apache-apisix-2.6-src.tgz -C apisix-2.6
```
安装运行时依赖的 Lua 库：
```
-cd apisix-2.5
+cd apisix-2.6
make deps
```
diff --git a/rockspec/apisix-2.6-0.rockspec b/rockspec/apisix-2.6-0.rockspec
new file mode 100644
index 0000000..c15397f
--- /dev/null
+++ b/rockspec/apisix-2.6-0.rockspec
@@ -0,0 +1,91 @@
+--
+-- 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.
+--
+
+package = "apisix"
+version = "2.6-0"
+supported_platforms = {"linux", "macosx"}
+
+source = {
+ url = "git://github.com/apache/apisix",
+ branch = "2.6",
+}
+
+description = {
+ summary = "Apache APISIX is a cloud-native microservices API gateway,
delivering the ultimate performance, security, open source and scalable
platform for all your APIs and microservices.",
+ homepage = "https://github.com/apache/apisix";,
+ license = "Apache License 2.0",
+}
+
+dependencies = {
+ "lua-resty-ctxdump = 0.1-0",
+ "lua-resty-dns-client = 5.2.0",
+ "lua-resty-template = 2.0",
+ "lua-resty-etcd = 1.5.0",
+ "lua-resty-balancer = 0.02rc5",
+ "lua-resty-ngxvar = 0.5.2",
+ "lua-resty-jit-uuid = 0.0.7",
+ "lua-resty-healthcheck-api7 = 2.2.0",
+ "lua-resty-jwt = 0.2.0",
+ "lua-resty-hmac-ffi = 0.05",
+ "lua-resty-cookie = 0.1.0",
+ "lua-resty-session = 2.24",
+ "opentracing-openresty = 0.1",
+ "lua-resty-radixtree = 2.8.0",
+ "lua-protobuf = 0.3.1",
+ "lua-resty-openidc = 1.7.2-1",
+ "luafilesystem = 1.7.0-2",
+ "lua-tinyyaml = 1.0",
+ "nginx-lua-prometheus = 0.20210206",
+ "jsonschema = 0.9.5",
+ "lua-resty-ipmatcher = 0.6",
+ "lua-resty-kafka = 0.07",
+ "lua-resty-logger-socket = 2.0-0",
+ "skywalking-nginx-lua = 0.4-1",
+ "base64 = 1.5-2",
+ "binaryheap = 0.4",
+ "dkjson = 2.5-2",
+ "resty-redis-cluster = 1.02-4",
+ "lua-resty-expr = 1.3.0",
+ "graphql = 0.0.2",
+ "argparse = 0.7.1-1",
+ "luasocket = 3.0rc1-2",
+ "luasec = 0.9-1",
+ "lua-resty-consul = 0.3-2",
+ "penlight = 1.9.2-1",
+ "ext-plugin-proto = 0.1.1",
+}
+
+build = {
+ type = "make",
+ build_variables = {
+ CFLAGS="$(CFLAGS)",
+ LIBFLAG="$(LIBFLAG)",
+ LUA_LIBDIR="$(LUA_LIBDIR)",
+ LUA_BINDIR="$(LUA_BINDIR)",
+ LUA_INCDIR="$(LUA_INCDIR)",
+ LUA="$(LUA)",
+ OPENSSL_INCDIR="$(OPENSSL_INCDIR)",
+ OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)",
+ },
+ install_variables = {
+ INST_PREFIX="$(PREFIX)",
+ INST_BINDIR="$(BINDIR)",
+ INST_LIBDIR="$(LIBDIR)",
+ INST_LUADIR="$(LUADIR)",
+ INST_CONFDIR="$(CONFDIR)",
+ },
+}
