From 6399750a90ac423c70acff0d0db4552f5dfa29eb Mon Sep 17 00:00:00 2001 From: tzssangglass Date: Fri, 29 Jul 2022 17:06:00 +0800 Subject: [PATCH 1/3] chore: upgrade lua-resty-etcd to 1.8.3 --- rockspec/apisix-master-0.rockspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rockspec/apisix-master-0.rockspec b/rockspec/apisix-master-0.rockspec index bb0b39e294e6..e012abd7217e 100644 --- a/rockspec/apisix-master-0.rockspec +++ b/rockspec/apisix-master-0.rockspec @@ -34,7 +34,7 @@ dependencies = { "lua-resty-ctxdump = 0.1-0", "lua-resty-dns-client = 6.0.2", "lua-resty-template = 2.0", - "lua-resty-etcd = 1.8.2", + "lua-resty-etcd = 1.8.3", "api7-lua-resty-http = 0.2.0", "lua-resty-balancer = 0.04", "lua-resty-ngxvar = 0.5.2", From 67e25403529fc3628f80d38e1348a171cb76cd2e Mon Sep 17 00:00:00 2001 From: tzssangglass Date: Mon, 1 Aug 2022 16:51:36 +0800 Subject: [PATCH 2/3] fix CI --- ci/pod/docker-compose.common.yml | 22 +++++++++++----------- t/deployment/conf_server.t | 4 ---- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/ci/pod/docker-compose.common.yml b/ci/pod/docker-compose.common.yml index 9e0394a48bd2..41fdae94c344 100644 --- a/ci/pod/docker-compose.common.yml +++ b/ci/pod/docker-compose.common.yml @@ -76,14 +76,14 @@ services: - ./t/certs:/certs - ## Redis cluster - redis-cluster: - image: vishnunair/docker-redis-cluster:latest - restart: unless-stopped - ports: - - "5000:6379" - - "5002:6380" - - "5003:6381" - - "5004:6382" - - "5005:6383" - - "5006:6384" + # ## Redis cluster + # redis-cluster: + # image: vishnunair/docker-redis-cluster:latest + # restart: unless-stopped + # ports: + # - "5000:6379" + # - "5002:6380" + # - "5003:6381" + # - "5004:6382" + # - "5005:6383" + # - "5006:6384" diff --git a/t/deployment/conf_server.t b/t/deployment/conf_server.t index 7b06cf09d396..4943c78e4fdb 100644 --- a/t/deployment/conf_server.t +++ b/t/deployment/conf_server.t @@ -124,8 +124,6 @@ deployment: - http://[::1]:2379 --- error_log dns resolve localhost, result: ---- no_error_log -[error] --- response_body foo @@ -236,8 +234,6 @@ OK --- error_log x.com is resolved to: 127.0.0.3 x.com is resolved to: 127.0.0.2 ---- no_error_log -[error] From 204e1d9bba02f4d2b65493e112efce9862d1dda2 Mon Sep 17 00:00:00 2001 From: tzssangglass Date: Mon, 1 Aug 2022 18:44:57 +0800 Subject: [PATCH 3/3] rollback --- ci/pod/docker-compose.common.yml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/ci/pod/docker-compose.common.yml b/ci/pod/docker-compose.common.yml index 41fdae94c344..9e0394a48bd2 100644 --- a/ci/pod/docker-compose.common.yml +++ b/ci/pod/docker-compose.common.yml @@ -76,14 +76,14 @@ services: - ./t/certs:/certs - # ## Redis cluster - # redis-cluster: - # image: vishnunair/docker-redis-cluster:latest - # restart: unless-stopped - # ports: - # - "5000:6379" - # - "5002:6380" - # - "5003:6381" - # - "5004:6382" - # - "5005:6383" - # - "5006:6384" + ## Redis cluster + redis-cluster: + image: vishnunair/docker-redis-cluster:latest + restart: unless-stopped + ports: + - "5000:6379" + - "5002:6380" + - "5003:6381" + - "5004:6382" + - "5005:6383" + - "5006:6384"