You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@apisix.apache.org by sp...@apache.org on 2022/04/01 01:31:02 UTC
[apisix] branch master updated: chore: upgrade etcd version to 3.4.18 for ci (#6755)
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 c9ce036 chore: upgrade etcd version to 3.4.18 for ci (#6755)
c9ce036 is described below
commit c9ce0362fc5201295c73398db2d50d32c9197462
Author: soulbird <zh...@outlook.com>
AuthorDate: Fri Apr 1 09:30:56 2022 +0800
chore: upgrade etcd version to 3.4.18 for ci (#6755)
Co-authored-by: soulbird <zh...@gmail.com>
---
ci/centos7-ci.sh | 8 ++++----
ci/pod/docker-compose.common.yml | 6 +++---
docs/en/latest/FAQ.md | 2 +-
docs/en/latest/how-to-build.md | 2 +-
docs/zh/latest/FAQ.md | 2 +-
docs/zh/latest/how-to-build.md | 2 +-
utils/linux-install-etcd-client.sh | 8 ++++----
7 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ci/centos7-ci.sh b/ci/centos7-ci.sh
index 1cff4a5..e29d401 100755
--- a/ci/centos7-ci.sh
+++ b/ci/centos7-ci.sh
@@ -35,10 +35,10 @@ install_dependencies() {
./utils/linux-install-luarocks.sh
# install etcdctl
- wget https://github.com/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz
- tar xf etcd-v3.4.0-linux-amd64.tar.gz
- cp ./etcd-v3.4.0-linux-amd64/etcdctl /usr/local/bin/
- rm -rf etcd-v3.4.0-linux-amd64
+ wget https://github.com/etcd-io/etcd/releases/download/v3.4.18/etcd-v3.4.18-linux-amd64.tar.gz
+ tar xf etcd-v3.4.18-linux-amd64.tar.gz
+ cp ./etcd-v3.4.18-linux-amd64/etcdctl /usr/local/bin/
+ rm -rf etcd-v3.4.18-linux-amd64
# install vault cli capabilities
install_vault_cli
diff --git a/ci/pod/docker-compose.common.yml b/ci/pod/docker-compose.common.yml
index ccf2635..ecbdfca 100644
--- a/ci/pod/docker-compose.common.yml
+++ b/ci/pod/docker-compose.common.yml
@@ -31,7 +31,7 @@ services:
- "3380:2380"
etcd:
- image: bitnami/etcd:3.4.0
+ image: bitnami/etcd:3.4.18
restart: unless-stopped
env_file:
- ci/pod/etcd/env/common.env
@@ -42,7 +42,7 @@ services:
- "2380:2380"
etcd_tls:
- image: bitnami/etcd:3.4.0
+ image: bitnami/etcd:3.4.18
restart: unless-stopped
env_file:
- ci/pod/etcd/env/common.env
@@ -58,7 +58,7 @@ services:
- ./t/certs:/certs
etcd_mtls:
- image: bitnami/etcd:3.4.0
+ image: bitnami/etcd:3.4.18
restart: unless-stopped
env_file:
- ci/pod/etcd/env/common.env
diff --git a/docs/en/latest/FAQ.md b/docs/en/latest/FAQ.md
index 497e786..88407ae 100644
--- a/docs/en/latest/FAQ.md
+++ b/docs/en/latest/FAQ.md
@@ -302,7 +302,7 @@ apisix:
Please follow the troubleshooting steps described below:
1. Make sure that there aren't any networking issues between Apache APISIX and your etcd deployment in your cluster.
-2. If your network is healthy, check whether you have enabled the [gRPC gateway](https://etcd.io/docs/v3.4.0/dev-guide/api_grpc_gateway/) for etcd. The default state depends on whether you used command line options or a configuration file to start the etcd server.
+2. If your network is healthy, check whether you have enabled the [gRPC gateway](https://etcd.io/docs/v3.4/dev-guide/api_grpc_gateway/) for etcd. The default state depends on whether you used command line options or a configuration file to start the etcd server.
- If you used command line options, gRPC gateway is enabled by default. You can enable it manually as shown below:
diff --git a/docs/en/latest/how-to-build.md b/docs/en/latest/how-to-build.md
index 0b9c877..746153a 100644
--- a/docs/en/latest/how-to-build.md
+++ b/docs/en/latest/how-to-build.md
@@ -169,7 +169,7 @@ This step is required only if you haven't installed [etcd](https://github.com/et
Run the command below to install etcd via the binary in Linux:
```shell
-ETCD_VERSION='3.4.13'
+ETCD_VERSION='3.4.18'
wget https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz
tar -xvf etcd-v${ETCD_VERSION}-linux-amd64.tar.gz && \
cd etcd-v${ETCD_VERSION}-linux-amd64 && \
diff --git a/docs/zh/latest/FAQ.md b/docs/zh/latest/FAQ.md
index c8a122a..65ae645 100644
--- a/docs/zh/latest/FAQ.md
+++ b/docs/zh/latest/FAQ.md
@@ -285,7 +285,7 @@ APISIX 主要使用 [etcd.watchdir](https://github.com/api7/lua-resty-etcd/blob/
首先请确保 APISIX 和 etcd 之间不存在网络分区的情况。
-如果网络的确是健康的，请检查你的 etcd 集群是否启用了 [gRPC gateway](https://etcd.io/docs/v3.4.0/dev-guide/api_grpc_gateway/) 特性。然而，当你使用命令行参数或配置文件启动 etcd 时，此特性的默认启用情况又是不同的。
+如果网络的确是健康的，请检查你的 etcd 集群是否启用了 [gRPC gateway](https://etcd.io/docs/v3.4/dev-guide/api_grpc_gateway/) 特性。然而，当你使用命令行参数或配置文件启动 etcd 时，此特性的默认启用情况又是不同的。
1. 当使用命令行参数启动 etcd，该特性默认被启用，相关选项是 `enable-grpc-gateway`。
diff --git a/docs/zh/latest/how-to-build.md b/docs/zh/latest/how-to-build.md
index 54bcaaa..8b49a75 100644
--- a/docs/zh/latest/how-to-build.md
+++ b/docs/zh/latest/how-to-build.md
@@ -163,7 +163,7 @@ sudo yum install ./apisix/*.rpm
你可以通过 Docker 或者二进制等方式安装 etcd。以下命令通过二进制方式在 Linux 上安装 etcd。
```shell
-ETCD_VERSION='3.4.13'
+ETCD_VERSION='3.4.18'
wget https://github.com/etcd-io/etcd/releases/download/v${ETCD_VERSION}/etcd-v${ETCD_VERSION}-linux-amd64.tar.gz
tar -xvf etcd-v${ETCD_VERSION}-linux-amd64.tar.gz && \
cd etcd-v${ETCD_VERSION}-linux-amd64 && \
diff --git a/utils/linux-install-etcd-client.sh b/utils/linux-install-etcd-client.sh
index aeb5183..8cefb01 100755
--- a/utils/linux-install-etcd-client.sh
+++ b/utils/linux-install-etcd-client.sh
@@ -17,7 +17,7 @@
# limitations under the License.
#
-wget https://github.com/etcd-io/etcd/releases/download/v3.4.0/etcd-v3.4.0-linux-amd64.tar.gz
-tar xf etcd-v3.4.0-linux-amd64.tar.gz
-sudo cp etcd-v3.4.0-linux-amd64/etcdctl /usr/local/bin/
-rm -rf etcd-v3.4.0-linux-amd64
+wget https://github.com/etcd-io/etcd/releases/download/v3.4.18/etcd-v3.4.18-linux-amd64.tar.gz
+tar xf etcd-v3.4.18-linux-amd64.tar.gz
+sudo cp etcd-v3.4.18-linux-amd64/etcdctl /usr/local/bin/
+rm -rf etcd-v3.4.18-linux-amd64