aboutsummaryrefslogtreecommitdiff
path: root/plugin/federation/setup.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2019-07-02 16:23:47 +0100
committerGravatar GitHub <noreply@github.com> 2019-07-02 16:23:47 +0100
commit22c6e3e179303955b62276de4b48293b2e90506c (patch)
tree40d967c0de397ca81d505b3d450d3c59671d9700 /plugin/federation/setup.go
parent3a0c7c61532db7f8e4ce79f99129201a79729525 (diff)
downloadcoredns-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/federation/setup.go')
-rw-r--r--plugin/federation/setup.go3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugin/federation/setup.go b/plugin/federation/setup.go
index 0e3decf1b..274219acb 100644
--- a/plugin/federation/setup.go
+++ b/plugin/federation/setup.go
@@ -47,6 +47,7 @@ func setup(c *caddy.Controller) error {
func federationParse(c *caddy.Controller) (*Federation, error) {
fed := New()
+ fed.Upstream = upstream.New()
for c.Next() {
// federation [zones..]
@@ -64,8 +65,8 @@ func federationParse(c *caddy.Controller) (*Federation, error) {
x := c.Val()
switch x {
case "upstream":
+ // remove soon
c.RemainingArgs()
- fed.Upstream = upstream.New()
default:
args := c.RemainingArgs()
if x := len(args); x != 1 {