change: upgrade etcd to version 0.8 and modify the connection keys. (a…

…pache#980)
SaberMaster · Jun 30, 2020 · f521373 · f521373
1 parent e22cf32
commit f521373
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/lua/apisix/core/config_etcd.lua b/lua/apisix/core/config_etcd.lua
@@ -380,6 +380,8 @@ function _M.new(key, opts)
 
     local etcd_conf = clone_tab(local_conf.etcd)
     local prefix = etcd_conf.prefix
+    etcd_conf.http_host = etcd_conf.host
+    etcd_conf.host = nil
     etcd_conf.prefix = nil
 
     local etcd_cli

diff --git a/lua/apisix/core/etcd.lua b/lua/apisix/core/etcd.lua
@@ -29,6 +29,8 @@ local function new()
 
     local etcd_conf = clone_tab(local_conf.etcd)
     local prefix = etcd_conf.prefix
+    etcd_conf.http_host = etcd_conf.host
+    etcd_conf.host = nil
     etcd_conf.prefix = nil
 
     local etcd_cli

diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec
@@ -31,7 +31,7 @@ description = {
 
 dependencies = {
     "lua-resty-template = 1.9",
-    "lua-resty-etcd = 0.7",
+    "lua-resty-etcd = 0.8",
     "lua-resty-balancer = 0.02rc5",
     "lua-resty-ngxvar = 0.4",
     "lua-resty-jit-uuid = 0.0.7",