Skip to content

Commit

Permalink
feat: release version 2.2
Browse files Browse the repository at this point in the history
Signed-off-by: spacewander <[email protected]>
  • Loading branch information
spacewander committed Jan 5, 2021
1 parent cc884f1 commit e8dcf37
Show file tree
Hide file tree
Showing 8 changed files with 176 additions and 17 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,5 @@ default.etcd/
/conf/config-*.yaml
!/conf/config-default.yaml
/conf/debug-*.yaml
# release tar package
*.tgz
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Table of Contents

- [2.2.0](#220)
- [2.1.0](#210)
- [2.0.0](#200)
- [1.5.0](#150)
Expand All @@ -33,6 +34,43 @@
- [0.7.0](#070)
- [0.6.0](#060)

## 2.2.0

## Change
- disable node-status plugin by default [#2968](https://github.com/apache/apisix/pull/2968)
- k8s_deployment_info is no longer allowed in upstream [#3098](https://github.com/apache/apisix/pull/3098)
- don't treat route segment with ':' as parameter by default [#3154](https://github.com/apache/apisix/pull/3154)

## Deprecated

### Core
- :sunrise: allow create consumers with multiple auth plugins [#2898](https://github.com/apache/apisix/pull/2898)
- :sunrise: increase the delay before resync etcd [#2977](https://github.com/apache/apisix/pull/2977)
- :sunrise: support enable/disable route [#2943](https://github.com/apache/apisix/pull/2943)
- :sunrise: route accroding to the graphql attributes [#2964](https://github.com/apache/apisix/pull/2964)
- :sunrise: share etcd auth token [#2932](https://github.com/apache/apisix/pull/2932)
- :sunrise: add control API [#3048](https://github.com/apache/apisix/pull/3048)

## Plugin
- :sunrise: feat(limt-count): use 'remote_addr' as default key [#2927](https://github.com/apache/apisix/pull/2927)
- :sunrise: feat(fault-injection): support Nginx variable in abort.body [#2986](https://github.com/apache/apisix/pull/2986)
- :sunrise: feat: implement new plugin `server-info` [#2926](https://github.com/apache/apisix/pull/2926)
- :sunrise: feat: add batch process metrics [#3070](https://github.com/apache/apisix/pull/3070)
- :sunrise: feat: Implement traffic splitting plugin [#2935](https://github.com/apache/apisix/pull/2935)
- :sunrise: feat: the proxy-rewrite plugin support pass nginx variable within header [#3144](https://github.com/apache/apisix/pull/3144)
- :sunrise: feat: Make headers to add to request in openid-connect plugin configurable [#2903](https://github.com/apache/apisix/pull/2903)
- :sunrise: feat: support var in upstream_uri on proxy-rewrite plugin [#3139](https://github.com/apache/apisix/pull/3139)

## Bugfix
- basic-auth plugin should run in rewrite phases. [#2905](https://github.com/apache/apisix/pull/2905)
- fixed the non effective config update in http/udp-logger [#2901](https://github.com/apache/apisix/pull/2901)
- always necessary to save the data of the limit concurrency, and release the statistical status in the log phase [#2465](https://github.com/apache/apisix/pull/2465)
- avoid duplicate auto-generated id [#3003](https://github.com/apache/apisix/pull/3003)
- fix: ctx being contaminated due to a new feature of openresty 1.19. **For openresty 1.19 users, it is recommended to upgrade the APISIX version as soon as possible.** [#3105](https://github.com/apache/apisix/pull/3105)
- fix: correct the validation of route.vars [#3124](https://github.com/apache/apisix/pull/3124)

For more changes, please refer to [Milestone](https://github.com/apache/apisix/milestone/10)

## 2.1.0

### Core
Expand Down
38 changes: 38 additions & 0 deletions CHANGELOG_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Table of Contents

- [2.2.0](#220)
- [2.1.0](#210)
- [2.0.0](#200)
- [1.5.0](#150)
Expand All @@ -33,6 +34,43 @@
- [0.7.0](#070)
- [0.6.0](#060)

## 2.2.0

## Change
- 默认不启用 node-status 插件 [#2968](https://github.com/apache/apisix/pull/2968)
- upstreeam 配置中不再允许使用 k8s_deployment_info [#3098](https://github.com/apache/apisix/pull/3098)
- 默认不再匹配路由中以 ':' 开头的参数变量 [#3154](https://github.com/apache/apisix/pull/3154)

## Deprecated

### Core
- :sunrise: 允许一个 consumer 关联多个认证插件 [#2898](https://github.com/apache/apisix/pull/2898)
- :sunrise: 增加 etcd 重试间隔,并允许配置 [#2977](https://github.com/apache/apisix/pull/2977)
- :sunrise: 允许启用或禁用 route [#2943](https://github.com/apache/apisix/pull/2943)
- :sunrise: 允许通过 graphql 属性进行路由 [#2964](https://github.com/apache/apisix/pull/2964)
- :sunrise: 共享 etcd 鉴权 token [#2932](https://github.com/apache/apisix/pull/2932)
- :sunrise: 新增 control API [#3048](https://github.com/apache/apisix/pull/3048)

## Plugin
- :sunrise: limt-count 中使用 'remote_addr' 作为默认 key [#2927](https://github.com/apache/apisix/pull/2927)
- :sunrise: 支持在 fault-injection 的 abort.body 中使用变量 [#2986](https://github.com/apache/apisix/pull/2986)
- :sunrise: 新增插件 `server-info` [#2926](https://github.com/apache/apisix/pull/2926)
- :sunrise: 增加 batch process 指标 [#3070](https://github.com/apache/apisix/pull/3070)
- :sunrise: 新增 traffic-split 插件 [#2935](https://github.com/apache/apisix/pull/2935)
- :sunrise: proxy-rewrite 支持在 header 中使用变量 [#3144](https://github.com/apache/apisix/pull/3144)
- :sunrise: openid-connect 插件增加更多配置项 [#2903](https://github.com/apache/apisix/pull/2903)
- :sunrise: proxy-rewrite 支持在 upstream_uri 中使用变量 [#3139](https://github.com/apache/apisix/pull/3139)

## Bugfix
- basic-auth 应该在 rewrite phase 执行 [#2905](https://github.com/apache/apisix/pull/2905)
- http/udp-logger 中插件配置运行时变更没有生效 [#2901](https://github.com/apache/apisix/pull/2901)
- 修复 limit-conn 对象没有被正确释放的问题 [#2465](https://github.com/apache/apisix/pull/2465)
- 修复自动生成的 id 可能重复的问题 [#3003](https://github.com/apache/apisix/pull/3003)
- 修复 OpenResty 1.19 下 ctx 互相影响的问题。**对于使用 OpenResty 1.19 的用户,请尽快升级到该版本。** [#3105](https://github.com/apache/apisix/pull/3105)
- 修复 route.vars 字段的校验 [#3124](https://github.com/apache/apisix/pull/3124)

更多的变动可以参考[里程碑](https://github.com/apache/apisix/milestone/10)

## 2.1.0

### Core
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -221,6 +221,7 @@ release-src:
--exclude logs \
--exclude t \
--exclude release \
--exclude $(RELEASE_SRC).tgz \
.

gpg --batch --yes --armor --detach-sig $(RELEASE_SRC).tgz
Expand Down
2 changes: 1 addition & 1 deletion apisix/core/version.lua
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
-- limitations under the License.
--
return {
VERSION = "2.1"
VERSION = "2.2"
}
16 changes: 8 additions & 8 deletions doc/how-to-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ You can install Apache APISIX in a variety of ways, including source code packag
You need to download the Apache source release first:

```shell
$ mkdir apisix-2.1
$ wget https://downloads.apache.org/apisix/2.1/apache-apisix-2.1-src.tgz
$ tar zxvf apache-apisix-2.1-src.tgz -C apisix-2.1
$ mkdir apisix-2.2
$ wget https://downloads.apache.org/apisix/2.2/apache-apisix-2.2-src.tgz
$ tar zxvf apache-apisix-2.2-src.tgz -C apisix-2.2
```

Install the Lua libraries that the runtime depends on:

```shell
cd apache-apisix-2.1
cd apache-apisix-2.2
make deps
```

### Installation via RPM package (CentOS 7)

```shell
sudo yum install -y https://github.com/apache/apisix/releases/download/2.1/apisix-2.1-0.el7.noarch.rpm
sudo yum install -y https://github.com/apache/apisix/releases/download/2.2/apisix-2.2-0.el7.noarch.rpm
```

### Installation via Luarocks (macOS not supported)
Expand All @@ -65,11 +65,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/apisix/master/
> Install the specified version via Luarocks:
```shell
# Install version 2.1
sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.1
# Install version 2.2
sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.2

# old luarocks not support the `lua-dir` parameter, you can remove this option
sudo luarocks install apisix 2.1
sudo luarocks install apisix 2.2
```

## 3. Manage (start/stop) APISIX Server
Expand Down
16 changes: 8 additions & 8 deletions doc/zh-cn/how-to-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,22 +34,22 @@ Apache APISIX 的运行环境需要 Nginx 和 etcd,
你需要先下载 Apache Release 源码包:

```shell
$ mkdir apisix-2.1
$ wget https://downloads.apache.org/apisix/2.1/apache-apisix-2.1-src.tgz
$ tar zxvf apache-apisix-2.1-src.tgz -C apisix-2.1
$ mkdir apisix-2.2
$ wget https://downloads.apache.org/apisix/2.2/apache-apisix-2.2-src.tgz
$ tar zxvf apache-apisix-2.2-src.tgz -C apisix-2.2
```

安装运行时依赖的 Lua 库:

```
cd apache-apisix-2.1
cd apache-apisix-2.2
make deps
```

### 通过 RPM 包安装(CentOS 7)

```shell
sudo yum install -y https://github.com/apache/apisix/releases/download/2.1/apisix-2.1-0.el7.noarch.rpm
sudo yum install -y https://github.com/apache/apisix/releases/download/2.2/apisix-2.2-0.el7.noarch.rpm
```

### 通过 Luarocks 安装 (不支持 macOS)
Expand All @@ -65,11 +65,11 @@ sudo sh -c "$(curl -fsSL https://raw.githubusercontent.com/apache/apisix/master/
> 通过 Luarocks 安装指定的版本:
```shell
# 安装 apisix 的 2.1 版本
sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.1
# 安装 apisix 的 2.2 版本
sudo luarocks install --lua-dir=/path/openresty/luajit apisix 2.2

# 老版本 luarocks 可能不支持 `lua-dir` 参数,可以删除该选项
sudo luarocks install apisix 2.1
sudo luarocks install apisix 2.2
```

## 3. 管理(启动、关闭等)APISIX 服务
Expand Down
80 changes: 80 additions & 0 deletions rockspec/apisix-2.2-0.rockspec
Original file line number Diff line number Diff line change
@@ -0,0 +1,80 @@
--
-- 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.2-0"
supported_platforms = {"linux", "macosx"}

source = {
url = "git://github.com/apache/apisix",
tag = "2.2",
}

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-template = 1.9",
"lua-resty-etcd = 1.4.3",
"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.6",
"lua-protobuf = 0.3.1",
"lua-resty-openidc = 1.7.2-1",
"luafilesystem = 1.7.0-2",
"lua-tinyyaml = 1.0",
"lua-resty-prometheus = 1.1",
"jsonschema = 0.9.3",
"lua-resty-ipmatcher = 0.6",
"lua-resty-kafka = 0.07",
"lua-resty-logger-socket = 2.0-0",
"skywalking-nginx-lua = 0.3-0",
"base64 = 1.5-2",
"dkjson = 2.5-2",
"resty-redis-cluster = 1.02-4",
"lua-resty-expr = 1.0.0",
"graphql = 0.0.2",
}

build = {
type = "make",
build_variables = {
CFLAGS="$(CFLAGS)",
LIBFLAG="$(LIBFLAG)",
LUA_LIBDIR="$(LUA_LIBDIR)",
LUA_BINDIR="$(LUA_BINDIR)",
LUA_INCDIR="$(LUA_INCDIR)",
LUA="$(LUA)",
},
install_variables = {
INST_PREFIX="$(PREFIX)",
INST_BINDIR="$(BINDIR)",
INST_LIBDIR="$(LIBDIR)",
INST_LUADIR="$(LUADIR)",
INST_CONFDIR="$(CONFDIR)",
},
}

0 comments on commit e8dcf37

Please sign in to comment.