Skip to content

Commit

Permalink
release: release 2.0 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
moonming committed Oct 20, 2020
1 parent 71dcf36 commit 79be83d
Show file tree
Hide file tree
Showing 8 changed files with 156 additions and 26 deletions.
29 changes: 28 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

# Table of Contents


- [2.0.0](#200)
- [1.5.0](#150)
- [1.4.1](#141)
- [1.4.0](#140)
Expand All @@ -32,6 +32,33 @@
- [0.7.0](#070)
- [0.6.0](#060)

## 2.0.0

This is release candidate.

### Core
- :sunrise: **Migrate from etcd v2 to v3 protocol, which is not backward compatible. Apache APISIX only supports etcd 3.4 and above versions.** [#2036](https://github.com/apache/apisix/pull/2036)
- add labels for upstream object.[#2279](https://github.com/apache/apisix/pull/2279)
- add managed fields in json schema for resources, such as create_time and update_time.[#2444](https://github.com/apache/apisix/pull/2444)
- use interceptors to protect plugin's route[#2416](https://github.com/apache/apisix/pull/2416)
- support multiple ports for http and https listen.[#2409](https://github.com/apache/apisix/pull/2409)
- implement `core.sleep`.[#2397](https://github.com/apache/apisix/pull/2397)

## Plugin
- :sunrise: **add AK/SK(HMAC) auth plugin.**[#2192](https://github.com/apache/apisix/pull/2192)
- :sunrise: add referer-restriction plugin.[#2352](https://github.com/apache/apisix/pull/2352)
- `limit-count` support to use `redis` cluster.[#2406](https://github.com/apache/apisix/pull/2406)
- feat(proxy-cache): store the temporary file under cache directory. [#2317](https://github.com/apache/apisix/pull/2317)
- feat(http-logger): support for specified the log formats via admin API [#2309](https://github.com/apache/apisix/pull/2309)

## Bugfix
- :bug: **`high priority`** When the data plane receives an instruction to delete a resource(router or upstream etc.), it does not properly clean up the cache, resulting in the existing resources cannot be found. This problem only occurs in the case of long and frequent deletion operations.[#2168](https://github.com/apache/apisix/pull/2168)
- fix routing priority does not take effect.[#2447](https://github.com/apache/apisix/pull/2447)
- set random seed for each worker process at `init_worker` phase, only `init` phase is not enough.[#2357](https://github.com/apache/apisix/pull/2357)
- remove unsupported algorithm in jwt plugin.[#2356](https://github.com/apache/apisix/pull/2356)
- return correct response code when `http_to_https` enabled in redirect plugin.[#2311](https://github.com/apache/apisix/pull/2311)

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

## 1.5.0

Expand Down
28 changes: 28 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.0.0](#200)
- [1.5.0](#150)
- [1.4.1](#141)
- [1.4.0](#140)
Expand All @@ -31,6 +32,33 @@
- [0.7.0](#070)
- [0.6.0](#060)

## 2.0.0

这是一个 release candidate。

### Core
- :sunrise: **从 etcd v2 协议迁移到 v3,这是不向下兼容的修改。Apache APISIX 只支持 etcd 3.4 以及后续的版本。** [#2036](https://github.com/apache/apisix/pull/2036)
- 支持为上游对象增加标签。[#2279](https://github.com/apache/apisix/pull/2279)
- 为上游、路由等资源增加更多字段,比如 create_time 和 update_time。[#2444](https://github.com/apache/apisix/pull/2444)
- 使用拦截器来保护插件的路由。[#2416](https://github.com/apache/apisix/pull/2416)
- 支持 http 和 https 监听多个端口。[#2409](https://github.com/apache/apisix/pull/2409)
- 实现 `core.sleep` 函数。[#2397](https://github.com/apache/apisix/pull/2397]

## Plugin
- :sunrise: **增加 AK/SK(HMAC) 认证插件。**[#2192](https://github.com/apache/apisix/pull/2192)
- :sunrise: 增加 referer-restriction 插件。[#2352](https://github.com/apache/apisix/pull/2352)
- `limit-count` 插件支持 `redis` cluster。[#2406](https://github.com/apache/apisix/pull/2406)
- proxy-cache 插件支持存储临时文件。[#2317](https://github.com/apache/apisix/pull/2317)
- http-logger 插件支持通过 admin API 来指定文件格式。[#2309](https://github.com/apache/apisix/pull/2309)

## Bugfix
- :bug: **`高优先级`** 当数据平面接收到删除某一个资源(路由、上游等)的指令时,没有正确的清理缓存,导致存在的资源也会找不到。这个问题在长时间、频繁删除操作的情况下才会出现。(#2168)[https://github.com/apache/apisix/pull/2168]
- 修复路由优先级不生效的问题。(#2447)[https://github.com/apache/apisix/pull/2447]
-`init_worker` 阶段设置随机数, 而不是 `init` 阶段。(#2357)[https://github.com/apache/apisix/pull/2357]
- 删除 jwt 插件中不支持的算法。(#2356)[https://github.com/apache/apisix/pull/2356]
- 当重定向插件的 `http_to_https` 开启时,返回正确的响应码。[#2311](https://github.com/apache/apisix/pull/2311)

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

## 1.5.0

Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ There are several ways to install the Apache Release version of APISIX:
- Installation runtime dependencies: OpenResty and etcd, and compilation dependencies: luarocks. Refer to [install dependencies documentation](doc/install-dependencies.md)
- Download the latest source code release package:
```shell
wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
tar zxvf apache-apisix-1.5-src.tar.gz
wget http://www.apache.org/dist/apisix/2.0/apache-apisix-2.0-src.tar.gz
tar zxvf apache-apisix-2.0-src.tar.gz
```
- Install the dependencies:
```shell
cd apache-apisix-1.5
cd apache-apisix-2.0
make deps
```
- check version of APISIX:
Expand All @@ -159,7 +159,7 @@ There are several ways to install the Apache Release version of APISIX:
- Installation runtime dependencies: OpenResty and etcd, refer to [install dependencies documentation](doc/install-dependencies.md#centos-7)
- install APISIX:
```shell
sudo yum install -y https://github.com/apache/apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
sudo yum install -y https://github.com/apache/apisix/releases/download/2.0/apisix-2.0-0.el7.noarch.rpm
```
- check version of APISIX:
```shell
Expand Down Expand Up @@ -266,7 +266,6 @@ Using AWS's 8 core server, APISIX's QPS reach to 140,000 with a latency of only
Benchmark comparison test [details data](https://gist.github.com/membphis/137db97a4bf64d3653aa42f3e016bd01)
## Milestones
- [2.0](https://github.com/apache/apisix/milestone/7)
- [2.1](https://github.com/apache/apisix/milestone/8)
## Videos And Articles
Expand Down
9 changes: 4 additions & 5 deletions README_CN.md
Original file line number Diff line number Diff line change
Expand Up @@ -128,12 +128,12 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10, macOS, **ARM64** Ubun
- 安装运行时依赖:OpenResty 和 etcd,以及编译的依赖:luarocks。参考[依赖安装文档](doc/zh-cn/install-dependencies.md)
- 下载最新的源码发布包:
```shell
wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
tar zxvf apache-apisix-1.5-src.tar.gz
wget http://www.apache.org/dist/apisix/2.0/apache-apisix-2.0-src.tar.gz
tar zxvf apache-apisix-2.0-src.tar.gz
```
- 安装运行时依赖的 Lua 库:
```shell
cd apache-apisix-1.5
cd apache-apisix-2.0
make deps
```
- 检查 APISIX 的版本号:
Expand All @@ -158,7 +158,7 @@ CentOS 7, Ubuntu 16.04, Ubuntu 18.04, Debian 9, Debian 10, macOS, **ARM64** Ubun
- 安装依赖:OpenResty 和 etcd,参考[依赖安装文档](doc/zh-cn/install-dependencies.md#centos-7)
- 安装 APISIX:
```shell
sudo yum install -y https://github.com/apache/apisix/releases/download/1.5/apisix-1.5-0.el7.noarch.rpm
sudo yum install -y https://github.com/apache/apisix/releases/download/2.0/apisix-2.0-0.el7.noarch.rpm
```
- 检查 APISIX 的版本号:
```shell
Expand Down Expand Up @@ -264,7 +264,6 @@ Dashboard 默认只允许 127.0.0.1 访问。你可以自行修改 `conf/config.
性能对比测试[详细内容如下](https://gist.github.com/membphis/137db97a4bf64d3653aa42f3e016bd01)。

## 开发计划
- [2.0](https://github.com/apache/apisix/milestone/7)
- [2.1](https://github.com/apache/apisix/milestone/8)

## 视频和文章
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 = "1.5"
VERSION = "2.0"
}
14 changes: 7 additions & 7 deletions doc/how-to-build.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,21 +34,21 @@ You can install Apache APISIX in a variety of ways, including source code packag
You need to download the Apache source release first:

```shell
wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
tar zxvf apache-apisix-1.5-src.tar.gz
wget http://www.apache.org/dist/apisix/2.0/apache-apisix-2.0-src.tar.gz
tar zxvf apache-apisix-2.0-src.tar.gz
```

Install the Lua libraries that the runtime depends on:

```shell
cd apache-apisix-1.5
cd apache-apisix-2.0
make deps
```

### Installation via RPM package (CentOS 7)

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

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

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

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

```shell
wget http://www.apache.org/dist/apisix/1.5/apache-apisix-1.5-src.tar.gz
tar zxvf apache-apisix-1.5-src.tar.gz
wget http://www.apache.org/dist/apisix/2.0/apache-apisix-2.0-src.tar.gz
tar zxvf apache-apisix-2.0-src.tar.gz
```

安装运行时依赖的 Lua 库:
```
cd apache-apisix-1.5
cd apache-apisix-2.0
make deps
```

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

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

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

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

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

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

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.2",
"lua-resty-balancer = 0.02rc5",
"lua-resty-ngxvar = 0.5",
"lua-resty-jit-uuid = 0.0.7",
"lua-resty-healthcheck-api7 = 2.2.0",
"lua-resty-jwt = 0.2.0",
"lua-resty-cookie = 0.1.0",
"lua-resty-session = 2.24",
"opentracing-openresty = 0.1",
"lua-resty-radixtree = 2.2",
"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.8",
"lua-resty-ipmatcher = 0.6",
"lua-resty-kafka = 0.07",
"lua-resty-logger-socket = 2.0-0",
"skywalking-nginx-lua-plugin = 1.0-0",
"base64 = 1.5-2",
"dkjson = 2.5-2",
"resty-redis-cluster = 1.02-4",
}

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 79be83d

Please sign in to comment.