Skip to content

Commit d4a8f92

Browse files
authored
refactor: drop support for etcd v2 API (#162)
1 parent 7386b9c commit d4a8f92

20 files changed

+24
-2451
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,10 @@ jobs:
1313
fail-fast: false
1414
matrix:
1515
include:
16-
- version: 2.2.5
17-
conf: Procfile-single
1816
- version: 3.4.0
19-
conf: Procfile-single-enable-v2
17+
conf: Procfile-single
2018
- version: 3.5.0
21-
conf: Procfile-single-enable-v2
19+
conf: Procfile-single
2220
- version: 3.4.0
2321
conf: Procfile-single-enable-tls
2422
- version: 3.4.0
@@ -27,7 +25,6 @@ jobs:
2725
runs-on: "ubuntu-20.04"
2826
env:
2927
OPENRESTY_PREFIX: "/usr/local/openresty"
30-
AUTH_ENDPOINT_V2: http://127.0.0.1:12379
3128
AUTH_ENDPOINT_V3: "127.0.0.1:12379"
3229
AUTH_USER: root
3330
AUTH_PWD: abc123
@@ -75,16 +72,13 @@ jobs:
7572
run: |
7673
if [[ "$GOREMAN_CONF" == "Procfile-single-enable-tls" ]]; then
7774
export ETCD_ENABLE_TLS=TRUE
78-
export AUTH_ENDPOINT_V2=https://127.0.0.1:12379
7975
export ETCDCTL_EXTRA_OPTS="--insecure-transport=false --insecure-skip-tls-verify=true"
8076
fi
8177
export PATH=$OPENRESTY_PREFIX/nginx/sbin:$OPENRESTY_PREFIX/luajit/bin:$PWD/etcd-v$ETCD_VER-linux-amd64:$PATH
8278
etcd --version
8379
goreman -f ./t/$GOREMAN_CONF start > goreman.log 2>&1 &
8480
sleep 5
85-
chmod +x ./t/v2/add-auth.sh
8681
chmod +x ./t/v3/add-auth.sh
87-
[[ $ETCD_ENABLE_TLS != TRUE ]] && ./t/v2/add-auth.sh || true
8882
[[ $ETCD_ENABLE_TLS != TRUE ]] && ./t/v3/add-auth.sh || true
8983
cat goreman.log
9084
ps -ef | grep etcd

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
11
Name
22
====
33

4-
[resty-etcd](https://github.com/iresty/lua-resty-etcd) Nonblocking Lua etcd driver library for OpenResty, this module supports etcd API v2 and v3.
4+
[resty-etcd](https://github.com/iresty/lua-resty-etcd) Nonblocking Lua etcd driver library for OpenResty, this module supports etcd API v3.
55

66
[![Build Status](https://travis-ci.org/api7/lua-resty-etcd.svg?branch=master)](https://travis-ci.org/api7/lua-resty-etcd)
77
[![License](https://img.shields.io/badge/License-Apache%202.0-blue.svg)](https://github.com/iresty/lua-resty-etcd/blob/master/LICENSE)
88

99
Table of Contents
1010
=================
1111
* [Install](#install)
12-
* [API v2](api_v2.md)
1312
* [API v3](api_v3.md)
14-
* **NOTE**: Requires ETCD version >= v3.4.0
13+
* **NOTE**: Requires ETCD version >= v3.4.0
1514

1615
## Install
1716

api_v2.md

Lines changed: 0 additions & 285 deletions
This file was deleted.

0 commit comments

Comments
 (0)