aboutsummaryrefslogtreecommitdiff
path: root/plugin/etcd/setup.go
diff options
context:
space:
mode:
authorGravatar Nitish Tiwari <nitish@minio.io> 2018-06-30 20:49:13 +0530
committerGravatar Miek Gieben <miek@miek.nl> 2018-06-30 16:19:13 +0100
commit6fe27d99be622f69ac0b1d402a67a571c6f6166e (patch)
tree8ad19accd3f1a59137b3116396518c1031bb4701 /plugin/etcd/setup.go
parentf3afd700210ffee655672b90b8cb78698f1d9e42 (diff)
downloadcoredns-6fe27d99be622f69ac0b1d402a67a571c6f6166e.tar.gz
coredns-6fe27d99be622f69ac0b1d402a67a571c6f6166e.tar.zst
coredns-6fe27d99be622f69ac0b1d402a67a571c6f6166e.zip
plugin/etcdv3: Add etcd v3 plugin (#1702)
* Update dependencies and add etcdv3 client * Update etcd plugin to support etcd v3 clients Fixes #341
Diffstat (limited to 'plugin/etcd/setup.go')
-rw-r--r--plugin/etcd/setup.go14
1 files changed, 7 insertions, 7 deletions
diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go
index 0cc8b0553..7e03acf0d 100644
--- a/plugin/etcd/setup.go
+++ b/plugin/etcd/setup.go
@@ -11,7 +11,7 @@ import (
"github.com/coredns/coredns/plugin/pkg/upstream"
"github.com/coredns/coredns/plugin/proxy"
- etcdc "github.com/coreos/etcd/client"
+ etcdcv3 "github.com/coreos/etcd/clientv3"
"github.com/mholt/caddy"
)
@@ -124,22 +124,22 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) {
}
etc.Client = client
etc.endpoints = endpoints
-
+
return &etc, stubzones, nil
}
return &Etcd{}, false, nil
}
-func newEtcdClient(endpoints []string, cc *tls.Config) (etcdc.KeysAPI, error) {
- etcdCfg := etcdc.Config{
+func newEtcdClient(endpoints []string, cc *tls.Config) (*etcdcv3.Client, error) {
+ etcdCfg := etcdcv3.Config{
Endpoints: endpoints,
- Transport: mwtls.NewHTTPSTransport(cc),
+ TLS: cc,
}
- cli, err := etcdc.New(etcdCfg)
+ cli, err := etcdcv3.New(etcdCfg)
if err != nil {
return nil, err
}
- return etcdc.NewKeysAPI(cli), nil
+ return cli, nil
}
const defaultEndpoint = "http://localhost:2379"