aboutsummaryrefslogtreecommitdiff
path: root/middleware/kubernetes/handler.go
diff options
context:
space:
mode:
authorGravatar Miek Gieben <miek@miek.nl> 2017-08-09 03:13:38 -0700
committerGravatar GitHub <noreply@github.com> 2017-08-09 03:13:38 -0700
commitb46b9880bd606fd2d0acaccf7d1915a8803bc81b (patch)
tree69a2d2169128210fa2c02d7e04e5a90f0c254d10 /middleware/kubernetes/handler.go
parentc3705ec68cbaf97a9a449373201237389cf40dbf (diff)
downloadcoredns-b46b9880bd606fd2d0acaccf7d1915a8803bc81b.tar.gz
coredns-b46b9880bd606fd2d0acaccf7d1915a8803bc81b.tar.zst
coredns-b46b9880bd606fd2d0acaccf7d1915a8803bc81b.zip
WIP: autopath as middleware (#859)
autopath as middleware
Diffstat (limited to 'middleware/kubernetes/handler.go')
-rw-r--r--middleware/kubernetes/handler.go65
1 files changed, 1 insertions, 64 deletions
diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go
index cb72e09eb..e95fc3c4b 100644
--- a/middleware/kubernetes/handler.go
+++ b/middleware/kubernetes/handler.go
@@ -2,10 +2,8 @@ package kubernetes
import (
"errors"
- "strings"
"github.com/coredns/coredns/middleware"
- "github.com/coredns/coredns/middleware/kubernetes/autopath"
"github.com/coredns/coredns/middleware/pkg/dnsutil"
"github.com/coredns/coredns/request"
@@ -40,70 +38,9 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
zone = state.Name()
}
+ // TODO(miek): place contents of route-request back here.
records, extra, _, err := k.routeRequest(zone, state)
- // Check for Autopath search eligibility
- if (k.autoPath != nil) && k.IsNameError(err) && (state.QType() == dns.TypeA || state.QType() == dns.TypeAAAA) {
- p := k.findPodWithIP(state.IP())
-
- for p != nil {
- name, path, ok := autopath.SplitSearch(zone, state.QName(), p.Namespace)
- if !ok {
- break
- }
- if (dns.CountLabel(name) - 1) < k.autoPath.NDots {
- break
- }
- origQName := state.QName()
- // Search "svc.cluster.local." and "cluster.local."
- for i := 0; i < 2; i++ {
- path = strings.Join(dns.SplitDomainName(path)[1:], ".")
- newstate := state.NewWithQuestion(strings.Join([]string{name, path}, "."), state.QType())
- records, extra, _, err = k.routeRequest(zone, newstate)
- if !k.IsNameError(err) && len(records) > 0 {
- records = append(records, nil)
- copy(records[1:], records)
- records[0] = autopath.CNAME(origQName, records[0].Header().Name, records[0].Header().Ttl)
- break
- }
- }
- if !k.IsNameError(err) {
- break
- }
- // Try host search path (if set) in the next middleware
- apw := autopath.NewWriter(w, r)
- for _, hostsearch := range k.autoPath.HostSearchPath {
- newstate := state.NewWithQuestion(strings.Join([]string{name, hostsearch}, "."), state.QType())
- rcode, nextErr := middleware.NextOrFailure(k.Name(), k.Next, ctx, apw, newstate.Req)
-
- if middleware.ClientWrite(rcode) || rcode == dns.RcodeNameError {
- return rcode, nextErr
- }
- }
- // Search . in this middleware
- newstate := state.NewWithQuestion(strings.Join([]string{name, "."}, ""), state.QType())
- records, extra, _, err = k.routeRequest(zone, newstate)
- if !k.IsNameError(err) && len(records) > 0 {
- records = append(records, nil)
- copy(records[1:], records)
- records[0] = autopath.CNAME(origQName, records[0].Header().Name, records[0].Header().Ttl)
- break
- }
- // Search . in the next middleware
- apw.Rcode = k.autoPath.OnNXDOMAIN
- newstate = state.NewWithQuestion(strings.Join([]string{name, "."}, ""), state.QType())
- r = newstate.Req
- rcode, nextErr := middleware.NextOrFailure(k.Name(), k.Next, ctx, apw, r)
- if !(middleware.ClientWrite(rcode) || rcode == dns.RcodeNameError) && nextErr == nil {
- r = dnsutil.Dedup(r)
- state.SizeAndDo(r)
- r, _ = state.Scrub(r)
- apw.WriteMsg(r)
- }
- return rcode, nextErr
- }
- }
-
if k.IsNameError(err) {
if k.Fallthrough {
return middleware.NextOrFailure(k.Name(), k.Next, ctx, w, r)