diff options
| author |  Chris O'Haver <cohaver@infoblox.com>
| 2018-02-14 15:11:26 -0500 |
|---|---|---|
| committer |  Miek Gieben <miek@miek.nl>
| 2018-02-14 21:11:26 +0100 |
| commit | 71ee323651ffed5d09aa22ea8d17eefbac2f6d08 (patch) | |
| tree | c9fb894a5de2dc34dd14b66057856244d8b28203 /plugin/etcd/setup.go | |
| parent | ee8084a08f8cfcd4357ae2ad0b6dff51ca322d3a (diff) | |
| download | coredns-71ee323651ffed5d09aa22ea8d17eefbac2f6d08.tar.gz coredns-71ee323651ffed5d09aa22ea8d17eefbac2f6d08.tar.zst coredns-71ee323651ffed5d09aa22ea8d17eefbac2f6d08.zip | |
plugin/kubernetes: Add upstream @self and loop count (#1484)
* add upstream @self and loop count
* 1st round of feedback
* allow argless upstream
* update test
* readmes
* feedback
Diffstat (limited to 'plugin/etcd/setup.go')
| -rw-r--r-- | plugin/etcd/setup.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go index 7d34c43f6..e9a1e013e 100644 --- a/plugin/etcd/setup.go +++ b/plugin/etcd/setup.go @@ -5,8 +5,8 @@ import ( "github.com/coredns/coredns/core/dnsserver" "github.com/coredns/coredns/plugin" - "github.com/coredns/coredns/plugin/pkg/dnsutil" mwtls "github.com/coredns/coredns/plugin/pkg/tls" + "github.com/coredns/coredns/plugin/pkg/upstream" "github.com/coredns/coredns/plugin/proxy" etcdc "github.com/coreos/etcd/client" @@ -90,13 +90,13 @@ func etcdParse(c *caddy.Controller) (*Etcd, bool, error) { case "upstream": args := c.RemainingArgs() if len(args) == 0 { - return &Etcd{}, false, c.ArgErr() + return nil, false, c.ArgErr() } - ups, err := dnsutil.ParseHostPortOrFile(args...) + u, err := upstream.NewUpstream(args) if err != nil { - return &Etcd{}, false, err + return nil, false, err } - etc.Proxy = proxy.NewLookup(ups) + etc.Upstream = u case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) |