TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

mw/etcd: fix 'fallthrough' (#1026)

Browse source 
* 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 9d44397827.

* Revert "mw/etcd: revert 'add fallthrough'"

This reverts commit 0cfe3cb1ab.

* mw/{etcd,kubernetes}: use fallthrough correctly

reverts of reverts, will rebase and squash later.
This commit is contained in:
Miek Gieben 2017-09-07 18:21:37 +01:00 • committed by John Belamaric
parent 594c6d7522
commit bcdc99ab11
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
middleware/etcd/handler.go
View file

@ -42,10 +42,7 @@ func (e *Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
if opt.Debug != "" {
r.Question[0].Name = opt.Debug
}
if e.Fallthrough {
return middleware.NextOrFailure(e.Name(), e.Next, ctx, w, r)
}
return dns.RcodeServerFailure, nil
return middleware.NextOrFailure(e.Name(), e.Next, ctx, w, r)
}
var (
@ -88,6 +85,9 @@ func (e *Etcd) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (
}
if e.IsNameError(err) {
if e.Fallthrough {
return middleware.NextOrFailure(e.Name(), e.Next, ctx, w, r)
}
// Make err nil when returning here, so we don't log spam for NXDOMAIN.
return middleware.BackendError(e, zone, dns.RcodeNameError, state, debug, nil /* err */, opt)
}

5
middleware/kubernetes/handler.go
View file

@ -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