Skip to content

Commit 724ea22

Browse files
committed
feat: release 2.13.0
Signed-off-by: spacewander <[email protected]>
1 parent 210575c commit 724ea22

File tree

10 files changed

+213
-11
lines changed

10 files changed

+213
-11
lines changed

.asf.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,10 @@ github:
4848
dismiss_stale_reviews: true
4949
require_code_owner_reviews: true
5050
required_approving_review_count: 2
51+
release/2.13:
52+
required_pull_request_reviews:
53+
require_code_owner_reviews: true
54+
required_approving_review_count: 2
5155
release/2.12:
5256
required_pull_request_reviews:
5357
require_code_owner_reviews: true

.github/workflows/centos7-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ jobs:
5151
run: |
5252
export VERSION=${{ steps.branch_env.outputs.version }}
5353
sudo gem install --no-document fpm
54-
git clone -b v2.7.0 https://github.com/api7/apisix-build-tools.git
54+
git clone --depth 1 https://github.com/api7/apisix-build-tools.git
5555
5656
# move codes under build tool
5757
mkdir ./apisix-build-tools/apisix

CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ title: Changelog
2323

2424
## Table of Contents
2525

26+
- [2.13.0](#2130)
2627
- [2.12.1](#2121)
2728
- [2.12.0](#2120)
2829
- [2.11.0](#2110)
@@ -53,6 +54,54 @@ title: Changelog
5354
- [0.7.0](#070)
5455
- [0.6.0](#060)
5556

57+
## 2.13.0
58+
59+
### Change
60+
61+
- change(syslog): correct the configuration [#6551](https://github.com/apache/apisix/pull/6551)
62+
- change(server-info): use a new approach(keepalive) to report DP info [#6202](https://github.com/apache/apisix/pull/6202)
63+
- change(admin): empty nodes should be encoded as array [#6384](https://github.com/apache/apisix/pull/6384)
64+
- change(prometheus): replace wrong apisix_nginx_http_current_connections{state="total"} label [#6327](https://github.com/apache/apisix/pull/6327)
65+
- change: don't expose public API by default & remove plugin interceptor [#6196](https://github.com/apache/apisix/pull/6196)
66+
67+
### Core
68+
69+
- :sunrise: feat: add delayed_body_filter phase [#6605](https://github.com/apache/apisix/pull/6605)
70+
- :sunrise: feat: support for reading environment variables from yaml configuration files [#6505](https://github.com/apache/apisix/pull/6505)
71+
- :sunrise: feat: rerun rewrite phase for newly added plugins in consumer [#6502](https://github.com/apache/apisix/pull/6502)
72+
- :sunrise: feat: add config to control write all status to x-upsream-apisix-status [#6392](https://github.com/apache/apisix/pull/6392)
73+
- :sunrise: feat: add kubernetes discovery module [#4880](https://github.com/apache/apisix/pull/4880)
74+
- :sunrise: feat(graphql): support http get and post json request [#6343](https://github.com/apache/apisix/pull/6343)
75+
76+
### Plugin
77+
78+
- :sunrise: feat: jwt-auth support custom parameters [#6561](https://github.com/apache/apisix/pull/6561)
79+
- :sunrise: feat: set cors allow origins by plugin metadata [#6546](https://github.com/apache/apisix/pull/6546)
80+
- :sunrise: feat: support post_logout_redirect_uri config in openid-connect plugin [#6455](https://github.com/apache/apisix/pull/6455)
81+
- :sunrise: feat: mocking plugin [#5940](https://github.com/apache/apisix/pull/5940)
82+
- :sunrise: feat(error-log-logger): add clickhouse for error-log-logger [#6256](https://github.com/apache/apisix/pull/6256)
83+
- :sunrise: feat: clickhouse logger [#6215](https://github.com/apache/apisix/pull/6215)
84+
- :sunrise: feat(grpc-transcode): support .pb file [#6264](https://github.com/apache/apisix/pull/6264)
85+
- :sunrise: feat: development of Loggly logging plugin [#6113](https://github.com/apache/apisix/pull/6113)
86+
- :sunrise: feat: add opentelemetry plugin [#6119](https://github.com/apache/apisix/pull/6119)
87+
- :sunrise: feat: add public api plugin [#6145](https://github.com/apache/apisix/pull/6145)
88+
- :sunrise: feat: add CSRF plugin [#5727](https://github.com/apache/apisix/pull/5727)
89+
90+
### Bugfix
91+
92+
- fix(skywalking,opentelemetry): trace request rejected by auth [#6617](https://github.com/apache/apisix/pull/6617)
93+
- fix(log-rotate): should rotate logs strictly hourly(or minutely) [#6521](https://github.com/apache/apisix/pull/6521)
94+
- fix: deepcopy doesn't copy the metatable [#6623](https://github.com/apache/apisix/pull/6623)
95+
- fix(request-validate): handle duplicate key in JSON [#6625](https://github.com/apache/apisix/pull/6625)
96+
- fix(prometheus): conflict between global rule and route configure [#6579](https://github.com/apache/apisix/pull/6579)
97+
- fix(proxy-rewrite): when conf.headers are missing,conf.method can make effect [#6300](https://github.com/apache/apisix/pull/6300)
98+
- fix(traffic-split): failed to match rule when the first rule failed [#6292](https://github.com/apache/apisix/pull/6292)
99+
- fix(config_etcd): skip resync_delay while etcd watch timeout [#6259](https://github.com/apache/apisix/pull/6259)
100+
- fix(proto): avoid sharing state [#6199](https://github.com/apache/apisix/pull/6199)
101+
- fix(limit-count): keep the counter if the plugin conf is the same [#6151](https://github.com/apache/apisix/pull/6151)
102+
- fix(admin): correct the count field of plugin-metadata/global-rule [#6155](https://github.com/apache/apisix/pull/6155)
103+
- fix: add missing labels after merging route and service [#6177](https://github.com/apache/apisix/pull/6177)
104+
56105
## 2.12.1
57106

58107
**This is an LTS maintenance release and you can see the CHANGELOG in `release/2.12` branch.**

apisix/core/version.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,5 @@
2020
-- @module core.version
2121

2222
return {
23-
VERSION = "2.12.0"
23+
VERSION = "2.13.0"
2424
}

docs/en/latest/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.12.0",
2+
"version": "2.13.0",
33
"sidebar": [
44
{
55
"type": "category",

docs/en/latest/how-to-build.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ Follow the steps below to install Apache APISIX via the source release package.
9797
curl https://raw.githubusercontent.com/apache/apisix/master/utils/install-dependencies.sh -sL | bash -
9898
```
9999

100-
2. Create a directory named `apisix-2.12.0`.
100+
2. Create a directory named `apisix-2.13.0`.
101101

102102
```shell
103-
APISIX_VERSION='2.12.0'
103+
APISIX_VERSION='2.13.0'
104104
mkdir apisix-${APISIX_VERSION}
105105
```
106106

@@ -162,9 +162,9 @@ Follow the steps below to install Apache APISIX via the source release package.
162162

163163
#### LTS version installation via Source Release Package
164164

165-
The [current LTS version](https://apisix.apache.org/downloads/) of Apache APISIX is `2.10.4`.
165+
The [current LTS version](https://apisix.apache.org/downloads/) of Apache APISIX is `2.13.0`.
166166

167-
To install this version, set `APISIX_VERSION` in [Installation via Source Release Package](#installation-via-source-release-package) to `2.10.4` and continue with the other steps.
167+
To install this version, set `APISIX_VERSION` in [Installation via Source Release Package](#installation-via-source-release-package) to this version and continue with the other steps.
168168

169169
## Step 2: Install etcd
170170

docs/zh/latest/CHANGELOG.md

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ title: CHANGELOG
2323

2424
## Table of Contents
2525

26+
- [2.13.0](#2130)
2627
- [2.12.1](#2121)
2728
- [2.12.0](#2120)
2829
- [2.11.0](#2110)
@@ -53,6 +54,54 @@ title: CHANGELOG
5354
- [0.7.0](#070)
5455
- [0.6.0](#060)
5556

57+
## 2.13.0
58+
59+
### Change
60+
61+
- 更正 syslog 插件的配置 [#6551](https://github.com/apache/apisix/pull/6551)
62+
- server-info 插件使用新方法来上报 DP 面信息 [#6202](https://github.com/apache/apisix/pull/6202)
63+
- Admin API 返回的空 nodes 应当被编码为数组 [#6384](https://github.com/apache/apisix/pull/6384)
64+
- 更正 prometheus 统计指标 apisix_nginx_http_current_connections{state="total"} [#6327](https://github.com/apache/apisix/pull/6327)
65+
- 不再默认暴露 public API 并移除 plugin interceptor [#6196](https://github.com/apache/apisix/pull/6196)
66+
67+
### Core
68+
69+
- :sunrise: 新增 delayed_body_filter 阶段 [#6605](https://github.com/apache/apisix/pull/6605)
70+
- :sunrise: standalone 模式的配置支持环境变量 [#6505](https://github.com/apache/apisix/pull/6505)
71+
- :sunrise: consumer 新增的插件都能被执行 [#6502](https://github.com/apache/apisix/pull/6502)
72+
- :sunrise: 添加配置项来控制是否在 x-upsream-apisix-status 中记录所有状态码 [#6392](https://github.com/apache/apisix/pull/6392)
73+
- :sunrise: 新增 kubernetes 服务发现 [#4880](https://github.com/apache/apisix/pull/4880)
74+
- :sunrise: graphql 路由支持 JSON 类型和 GET 方法 [#6343](https://github.com/apache/apisix/pull/6343)
75+
76+
### Plugin
77+
78+
- :sunrise: jwt-auth 支持自定义参数名 [#6561](https://github.com/apache/apisix/pull/6561)
79+
- :sunrise: cors 参数支持通过 plugin metadata 配置 [#6546](https://github.com/apache/apisix/pull/6546)
80+
- :sunrise: openid-connect 支持 post_logout_redirect_uri [#6455](https://github.com/apache/apisix/pull/6455)
81+
- :sunrise: mocking 插件 [#5940](https://github.com/apache/apisix/pull/5940)
82+
- :sunrise: error-log-logger 新增 clickhouse 支持 [#6256](https://github.com/apache/apisix/pull/6256)
83+
- :sunrise: clickhouse 日志插件 [#6215](https://github.com/apache/apisix/pull/6215)
84+
- :sunrise: grpc-transcode 支持处理 .pb 文件 [#6264](https://github.com/apache/apisix/pull/6264)
85+
- :sunrise: loggly 日志插件 [#6113](https://github.com/apache/apisix/pull/6113)
86+
- :sunrise: opentelemetry 日志插件 [#6119](https://github.com/apache/apisix/pull/6119)
87+
- :sunrise: public api 插件 [#6145](https://github.com/apache/apisix/pull/6145)
88+
- :sunrise: CSRF 插件 [#5727](https://github.com/apache/apisix/pull/5727)
89+
90+
### Bugfix
91+
92+
- 修复 skywalking,opentelemetry 没有追踪认证失败的问题 [#6617](https://github.com/apache/apisix/pull/6617)
93+
- log-rotate 切割日志时按整点完成 [#6521](https://github.com/apache/apisix/pull/6521)
94+
- deepcopy 没有复制 metatable [#6623](https://github.com/apache/apisix/pull/6623)
95+
- request-validate 修复对 JSON 里面重复键的处理 [#6625](https://github.com/apache/apisix/pull/6625)
96+
- prometheus 避免重复计算指标 [#6579](https://github.com/apache/apisix/pull/6579)
97+
- 修复 proxy-rewrite 中,当 conf.headers 缺失时,conf.method 不生效的问题 [#6300](https://github.com/apache/apisix/pull/6300)
98+
- 修复 traffic-split 首条规则失败时无法匹配的问题 [#6292](https://github.com/apache/apisix/pull/6292)
99+
- etcd 超时不应触发 resync_delay [#6259](https://github.com/apache/apisix/pull/6259)
100+
- 解决 proto 定义冲突 [#6199](https://github.com/apache/apisix/pull/6199)
101+
- limit-count 配置不变,不应重置计数器 [#6151](https://github.com/apache/apisix/pull/6151)
102+
- Admin API 的 plugin-metadata 和 global-rule 计数有误 [#6155](https://github.com/apache/apisix/pull/6155)
103+
- 解决合并 route 和 service 时 labels 丢失问题 [#6177](https://github.com/apache/apisix/pull/6177)
104+
56105
## 2.12.1
57106

58107
**这是一个 LTS 维护版本,您可以在 `release/2.12` 分支中看到 CHANGELOG。**

docs/zh/latest/config.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"version": "2.12.0",
2+
"version": "2.13.0",
33
"sidebar": [
44
{
55
"type": "category",

docs/zh/latest/how-to-build.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ sudo yum install ./apisix/*.rpm
9393
curl https://raw.githubusercontent.com/apache/apisix/master/utils/install-dependencies.sh -sL | bash -
9494
```
9595

96-
2. 创建一个名为 `apisix-2.12.0` 的目录。
96+
2. 创建一个名为 `apisix-2.13.0` 的目录。
9797

9898
```shell
99-
APISIX_VERSION='2.12.0'
99+
APISIX_VERSION='2.13.0'
100100
mkdir apisix-${APISIX_VERSION}
101101
```
102102

@@ -158,7 +158,7 @@ sudo yum install ./apisix/*.rpm
158158

159159
#### 通过源码包安装 LTS 版本
160160

161-
目前 Apache APISIX 的 LTS 版本为 `2.10.4`,将“[通过源码包安装](#通过源码包安装)”中的 `APISIX_VERSION` 设置成 `2.10.4` ,其他步骤按顺序进行即可。
161+
目前 Apache APISIX 的 LTS 版本为 `2.13.0`,将“[通过源码包安装](#通过源码包安装)”中的 `APISIX_VERSION` 设置成该版本号,其他步骤按顺序进行即可。
162162

163163
## 步骤2:安装 etcd
164164

rockspec/apisix-2.13.0-0.rockspec

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
--
2+
-- Licensed to the Apache Software Foundation (ASF) under one or more
3+
-- contributor license agreements. See the NOTICE file distributed with
4+
-- this work for additional information regarding copyright ownership.
5+
-- The ASF licenses this file to You under the Apache License, Version 2.0
6+
-- (the "License"); you may not use this file except in compliance with
7+
-- the License. You may obtain a copy of the License at
8+
--
9+
-- http://www.apache.org/licenses/LICENSE-2.0
10+
--
11+
-- Unless required by applicable law or agreed to in writing, software
12+
-- distributed under the License is distributed on an "AS IS" BASIS,
13+
-- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14+
-- See the License for the specific language governing permissions and
15+
-- limitations under the License.
16+
--
17+
18+
package = "apisix"
19+
version = "2.13.0-0"
20+
supported_platforms = {"linux", "macosx"}
21+
22+
source = {
23+
url = "git://github.com/apache/apisix",
24+
branch = "2.13.0",
25+
}
26+
27+
description = {
28+
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.",
29+
homepage = "https://github.com/apache/apisix",
30+
license = "Apache License 2.0",
31+
}
32+
33+
dependencies = {
34+
"lua-resty-ctxdump = 0.1-0",
35+
"lua-resty-dns-client = 6.0.2",
36+
"lua-resty-template = 2.0",
37+
"lua-resty-etcd = 1.6.0",
38+
"api7-lua-resty-http = 0.2.0",
39+
"lua-resty-balancer = 0.04",
40+
"lua-resty-ngxvar = 0.5.2",
41+
"lua-resty-jit-uuid = 0.0.7",
42+
"lua-resty-healthcheck-api7 = 2.2.0",
43+
"lua-resty-jwt = 0.2.0",
44+
"lua-resty-hmac-ffi = 0.05",
45+
"lua-resty-cookie = 0.1.0",
46+
"lua-resty-session = 2.24",
47+
"opentracing-openresty = 0.1",
48+
"lua-resty-radixtree = 2.8.1",
49+
"lua-protobuf = 0.3.4",
50+
"lua-resty-openidc = 1.7.2-1",
51+
"luafilesystem = 1.7.0-2",
52+
"api7-lua-tinyyaml = 0.4.2",
53+
"nginx-lua-prometheus = 0.20220127",
54+
"jsonschema = 0.9.8",
55+
"lua-resty-ipmatcher = 0.6.1",
56+
"lua-resty-kafka = 0.07",
57+
"lua-resty-logger-socket = 2.0-0",
58+
"skywalking-nginx-lua = 0.6.0",
59+
"base64 = 1.5-2",
60+
"binaryheap = 0.4",
61+
"api7-dkjson = 0.1.1",
62+
"resty-redis-cluster = 1.02-4",
63+
"lua-resty-expr = 1.3.1",
64+
"graphql = 0.0.2",
65+
"argparse = 0.7.1-1",
66+
"luasocket = 3.0rc1-2",
67+
"luasec = 0.9-1",
68+
"lua-resty-consul = 0.3-2",
69+
"penlight = 1.9.2-1",
70+
"ext-plugin-proto = 0.4.0",
71+
"casbin = 1.26.0",
72+
"api7-snowflake = 2.0-1",
73+
"inspect == 3.1.1",
74+
"lualdap = 1.2.6-1",
75+
"lua-resty-rocketmq = 0.3.0-0",
76+
"opentelemetry-lua = 0.1-3",
77+
"net-url = 0.9-1",
78+
"xml2lua = 1.5-2",
79+
}
80+
81+
build = {
82+
type = "make",
83+
build_variables = {
84+
CFLAGS="$(CFLAGS)",
85+
LIBFLAG="$(LIBFLAG)",
86+
LUA_LIBDIR="$(LUA_LIBDIR)",
87+
LUA_BINDIR="$(LUA_BINDIR)",
88+
LUA_INCDIR="$(LUA_INCDIR)",
89+
LUA="$(LUA)",
90+
OPENSSL_INCDIR="$(OPENSSL_INCDIR)",
91+
OPENSSL_LIBDIR="$(OPENSSL_LIBDIR)",
92+
},
93+
install_variables = {
94+
ENV_INST_PREFIX="$(PREFIX)",
95+
ENV_INST_BINDIR="$(BINDIR)",
96+
ENV_INST_LIBDIR="$(LIBDIR)",
97+
ENV_INST_LUADIR="$(LUADIR)",
98+
ENV_INST_CONFDIR="$(CONFDIR)",
99+
},
100+
}

0 commit comments

Comments
 (0)