From bcdc99ab11b4fb6c6ebb06cfa0ae15ed269ad02e Mon Sep 17 00:00:00 2001 From: Miek Gieben Date: Thu, 7 Sep 2017 18:21:37 +0100 Subject: mw/etcd: fix 'fallthrough' (#1026) * mw/etcd: revert 'add fallthrough' This removes 'fallthrough' for *etcd* which is not needed. This was added in 00f5c7797 but is totally not needed and creates backwards incompat behavior even. Thanks to @johnbelamaric for pointing this out in #925. * remove here as well * Revert "remove here as well" This reverts commit 9d44397827425e567af01d43564c4294b42e98c9. * Revert "mw/etcd: revert 'add fallthrough'" This reverts commit 0cfe3cb1ab5495ed38a8a0486e3f5386f3bd95dc. * mw/{etcd,kubernetes}: use fallthrough correctly reverts of reverts, will rebase and squash later. --- middleware/kubernetes/handler.go | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'middleware/kubernetes/handler.go') diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go index b6cc703b7..58aecfe1a 100644 --- a/middleware/kubernetes/handler.go +++ b/middleware/kubernetes/handler.go @@ -19,10 +19,7 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M zone := middleware.Zones(k.Zones).Matches(state.Name()) if zone == "" { - if k.Fallthrough { - return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r) - } - return dns.RcodeServerFailure, nil + return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r) } state.Zone = zone -- cgit v1.2.3