diff options
| author |  Miek Gieben <miek@miek.nl>
| 2019-07-02 16:23:47 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2019-07-02 16:23:47 +0100 |
| commit | 22c6e3e179303955b62276de4b48293b2e90506c (patch) | |
| tree | 40d967c0de397ca81d505b3d450d3c59671d9700 /plugin/etcd/setup.go | |
| parent | 3a0c7c61532db7f8e4ce79f99129201a79729525 (diff) | |
| download | coredns-22c6e3e179303955b62276de4b48293b2e90506c.tar.gz coredns-22c6e3e179303955b62276de4b48293b2e90506c.tar.zst coredns-22c6e3e179303955b62276de4b48293b2e90506c.zip | |
plugins: set upstream unconditionally (#2956)
`upstream` is not needed as a setting; just set if unconditionally and
remove all documentation and tests for it.
At some point we want remove the hanlding for `upstream` as well and
error out on seeing it.
Signed-off-by: Miek Gieben <miek@miek.nl>
Diffstat (limited to 'plugin/etcd/setup.go')
| -rw-r--r-- | plugin/etcd/setup.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugin/etcd/setup.go b/plugin/etcd/setup.go index a5f9c5af2..1ac00c45b 100644 --- a/plugin/etcd/setup.go +++ b/plugin/etcd/setup.go @@ -45,6 +45,9 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) { username string password string ) + + etc.Upstream = upstream.New() + for c.Next() { etc.Zones = c.RemainingArgs() if len(etc.Zones) == 0 { @@ -75,9 +78,8 @@ func etcdParse(c *caddy.Controller) (*Etcd, error) { } endpoints = args case "upstream": - // check args != 0 and error in the future - c.RemainingArgs() // clear buffer - etc.Upstream = upstream.New() + // remove soon + c.RemainingArgs() case "tls": // cert key cacertfile args := c.RemainingArgs() tlsConfig, err = mwtls.NewTLSConfigFromArgs(args...) |