aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--middleware/kubernetes/autopath/autopath.go36
-rw-r--r--middleware/kubernetes/autopath/autopath_test.go26
-rw-r--r--middleware/kubernetes/autopath_test.go176
-rw-r--r--middleware/kubernetes/handler.go11
-rw-r--r--middleware/kubernetes/handler_test.go154
-rw-r--r--middleware/kubernetes/kubernetes.go8
-rw-r--r--middleware/kubernetes/kubernetes_test.go25
7 files changed, 226 insertions, 210 deletions
diff --git a/middleware/kubernetes/autopath/autopath.go b/middleware/kubernetes/autopath/autopath.go
index abcb360ae..c1b2179ae 100644
--- a/middleware/kubernetes/autopath/autopath.go
+++ b/middleware/kubernetes/autopath/autopath.go
@@ -1,6 +1,10 @@
package autopath
-import "github.com/miekg/dns"
+import (
+ "strings"
+
+ "github.com/miekg/dns"
+)
// Writer implements a ResponseWriter that also does the following:
// * reverts question section of a packet to its original state.
@@ -18,7 +22,6 @@ type Writer struct {
dns.ResponseWriter
original dns.Question
Rcode int
- Sent bool
}
// AutoPath enables server side search path lookups for pods.
@@ -40,24 +43,10 @@ func NewWriter(w dns.ResponseWriter, r *dns.Msg) *Writer {
// WriteMsg writes to client, unless response will be NXDOMAIN.
func (apw *Writer) WriteMsg(res *dns.Msg) error {
- return apw.overrideMsg(res, false)
-}
-
-// ForceWriteMsg forces the write to client regardless of response code.
-func (apw *Writer) ForceWriteMsg(res *dns.Msg) error {
- return apw.overrideMsg(res, true)
-}
-
-// overrideMsg overrides rcode, reverts question, adds CNAME, and calls the
-// underlying ResponseWriter's WriteMsg method unless the write is deferred,
-// or force = true.
-func (apw *Writer) overrideMsg(res *dns.Msg, force bool) error {
if res.Rcode == dns.RcodeNameError {
res.Rcode = apw.Rcode
}
- if res.Rcode != dns.RcodeSuccess && !force {
- return nil
- }
+
for _, a := range res.Answer {
if apw.original.Name == a.Header().Name {
continue
@@ -67,7 +56,7 @@ func (apw *Writer) overrideMsg(res *dns.Msg, force bool) error {
res.Answer[0] = CNAME(apw.original.Name, a.Header().Name, a.Header().Ttl)
}
res.Question[0] = apw.original
- apw.Sent = true
+
return apw.ResponseWriter.WriteMsg(res)
}
@@ -77,9 +66,10 @@ func (apw *Writer) Write(buf []byte) (int, error) {
return n, err
}
-// Hijack implements dns.Hijacker. It simply wraps the underlying
-// ResponseWriter's Hijack method if there is one, or returns an error.
-func (apw *Writer) Hijack() {
- apw.ResponseWriter.Hijack()
- return
+func SplitSearch(zone, question, namespace string) (name, search string, ok bool) {
+ search = strings.Join([]string{namespace, "svc", zone}, ".")
+ if dns.IsSubDomain(search, question) {
+ return question[:len(question)-len(search)-1], search, true
+ }
+ return "", "", false
}
diff --git a/middleware/kubernetes/autopath/autopath_test.go b/middleware/kubernetes/autopath/autopath_test.go
new file mode 100644
index 000000000..787896e42
--- /dev/null
+++ b/middleware/kubernetes/autopath/autopath_test.go
@@ -0,0 +1,26 @@
+package autopath
+
+import "testing"
+
+func TestSplitSearchPath(t *testing.T) {
+ type testCase struct {
+ question string
+ namespace string
+ expectedName string
+ expectedSearch string
+ expectedOk bool
+ }
+ tests := []testCase{
+ {question: "test.blah.com", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
+ {question: "foo.com.ns2.svc.interwebs.nets", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
+ {question: "foo.com.svc.interwebs.nets", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
+ {question: "foo.com.ns1.svc.interwebs.nets", namespace: "ns1", expectedName: "foo.com", expectedSearch: "ns1.svc.interwebs.nets", expectedOk: true},
+ }
+ zone := "interwebs.nets"
+ for _, c := range tests {
+ name, search, ok := SplitSearch(zone, c.question, c.namespace)
+ if c.expectedName != name || c.expectedSearch != search || c.expectedOk != ok {
+ t.Errorf("Case %v: Expected name'%v', search:'%v', ok:'%v'. Got name:'%v', search:'%v', ok:'%v'.", c.question, c.expectedName, c.expectedSearch, c.expectedOk, name, search, ok)
+ }
+ }
+}
diff --git a/middleware/kubernetes/autopath_test.go b/middleware/kubernetes/autopath_test.go
new file mode 100644
index 000000000..76fd1bbc0
--- /dev/null
+++ b/middleware/kubernetes/autopath_test.go
@@ -0,0 +1,176 @@
+package kubernetes
+
+import (
+ "net"
+ "testing"
+
+ "github.com/coredns/coredns/middleware/kubernetes/autopath"
+ "github.com/coredns/coredns/middleware/test"
+
+ "github.com/miekg/dns"
+ "golang.org/x/net/context"
+)
+
+var autopathCases = map[string](*test.Case){
+ "A Autopath Service (Second Search)": {
+ Qname: "svc1.testns.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("svc1.testns.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
+ test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
+ },
+ },
+ "A Autopath Service (Third Search)": {
+ Qname: "svc1.testns.svc.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("svc1.testns.svc.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
+ test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
+ },
+ },
+ "A Autopath Next Middleware (Host Domain Search)": {
+ Qname: "test1.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("test1.podns.svc.cluster.local. 0 IN CNAME test1.hostdom.test."),
+ test.A("test1.hostdom.test. 0 IN A 11.22.33.44"),
+ },
+ },
+ "A Autopath Service (Bare Search)": {
+ Qname: "svc1.testns.svc.cluster.local.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("svc1.testns.svc.cluster.local.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
+ test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
+ },
+ },
+ "A Autopath Next Middleware (Bare Search)": {
+ Qname: "test2.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("test2.interwebs.podns.svc.cluster.local. 0 IN CNAME test2.interwebs."),
+ test.A("test2.interwebs. 0 IN A 55.66.77.88"),
+ },
+ },
+ "AAAA Autopath Next Middleware (Bare Search)": {
+ Qname: "test2.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeAAAA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.CNAME("test2.interwebs.podns.svc.cluster.local. 0 IN CNAME test2.interwebs."),
+ test.AAAA("test2.interwebs. 0 IN AAAA 5555:6666:7777::8888"),
+ },
+ },
+}
+
+var autopathBareSearch = map[string](*test.Case){
+ "A Autopath Next Middleware (Bare Search) Non-existing OnNXDOMAIN default": {
+ Qname: "nothere.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{},
+ },
+}
+
+var autopathBareSearchExpectNameErr = map[string](*test.Case){
+ "A Autopath Next Middleware (Bare Search) Non-existing OnNXDOMAIN disabled": {
+ Qname: "nothere.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeNameError,
+ Answer: []dns.RR{},
+ },
+}
+
+var autopath2NDotsCases = map[string](*test.Case){
+ "A Service (0 Dots)": {
+ Qname: "foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeNameError,
+ Answer: []dns.RR{},
+ Ns: []dns.RR{
+ test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"),
+ },
+ },
+ "A Service (1 Dots)": {
+ Qname: "foo.foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeNameError,
+ Answer: []dns.RR{},
+ Ns: []dns.RR{
+ test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"),
+ },
+ },
+ "A Service (2 Dots)": {
+ Qname: "foo.foo.foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
+ Rcode: dns.RcodeSuccess,
+ Answer: []dns.RR{
+ test.A("foo.foo.foo.hostdom.test. 0 IN A 11.22.33.44"),
+ test.CNAME("foo.foo.foo.podns.svc.cluster.local. 0 IN CNAME foo.foo.foo.hostdom.test."),
+ },
+ },
+}
+
+// Disabled because broken.
+func testServeDNSAutoPath(t *testing.T) {
+
+ k := Kubernetes{}
+ k.Zones = []string{"cluster.local."}
+ _, cidr, _ := net.ParseCIDR("10.0.0.0/8")
+
+ k.ReverseCidrs = []net.IPNet{*cidr}
+ k.Federations = []Federation{{name: "fed", zone: "federal.test."}}
+ k.APIConn = &APIConnServeTest{}
+ k.autoPath = new(autopath.AutoPath)
+ k.autoPath.HostSearchPath = []string{"hostdom.test"}
+ k.interfaceAddrsFunc = localPodIP
+ k.Next = nextHandler(nextMap)
+
+ ctx := context.TODO()
+ runServeDNSTests(ctx, t, autopathCases, k)
+ runServeDNSTests(ctx, t, autopathBareSearch, k)
+
+ // Set ndots to 2 for the ndots test cases
+ k.autoPath.NDots = 2
+ runServeDNSTests(ctx, t, autopath2NDotsCases, k)
+ k.autoPath.NDots = defautNdots
+ // Disable the NXDOMAIN override (enabled by default)
+ k.autoPath.OnNXDOMAIN = dns.RcodeNameError
+ runServeDNSTests(ctx, t, autopathCases, k)
+ runServeDNSTests(ctx, t, autopathBareSearchExpectNameErr, k)
+}
+
+var nextMap = map[dns.Question]dns.Msg{
+ {Name: "test1.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.A("test1.hostdom.test. 0 IN A 11.22.33.44")},
+ },
+ {Name: "test2.interwebs.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.A("test2.interwebs. 0 IN A 55.66.77.88")},
+ },
+ {Name: "test2.interwebs.", Qtype: dns.TypeAAAA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.AAAA("test2.interwebs. 0 IN AAAA 5555:6666:7777::8888")},
+ },
+ {Name: "foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.A("foo.hostdom.test. 0 IN A 11.22.33.44")},
+ },
+ {Name: "foo.foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.A("foo.foo.hostdom.test. 0 IN A 11.22.33.44")},
+ },
+ {Name: "foo.foo.foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
+ Answer: []dns.RR{test.A("foo.foo.foo.hostdom.test. 0 IN A 11.22.33.44")},
+ },
+}
+
+// nextHandler returns a Handler that returns an answer for the question in the
+// request per the question->answer map qMap.
+func nextHandler(mm map[dns.Question]dns.Msg) test.Handler {
+ return test.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
+ m := new(dns.Msg)
+ m.SetReply(r)
+
+ msg, ok := mm[r.Question[0]]
+ if !ok {
+ r.Rcode = dns.RcodeNameError
+ w.WriteMsg(m)
+ return r.Rcode, nil
+ }
+ r.Rcode = dns.RcodeSuccess
+ m.Answer = append(m.Answer, msg.Answer...)
+ w.WriteMsg(m)
+ return r.Rcode, nil
+ })
+}
diff --git a/middleware/kubernetes/handler.go b/middleware/kubernetes/handler.go
index 3ef4f7a37..cb72e09eb 100644
--- a/middleware/kubernetes/handler.go
+++ b/middleware/kubernetes/handler.go
@@ -39,13 +39,15 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
// Set the zone to this specific request.
zone = state.Name()
}
+
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 := splitSearch(zone, state.QName(), p.Namespace)
+ name, path, ok := autopath.SplitSearch(zone, state.QName(), p.Namespace)
if !ok {
break
}
@@ -73,7 +75,8 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
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 apw.Sent {
+
+ if middleware.ClientWrite(rcode) || rcode == dns.RcodeNameError {
return rcode, nextErr
}
}
@@ -91,11 +94,11 @@ func (k Kubernetes) ServeDNS(ctx context.Context, w dns.ResponseWriter, r *dns.M
newstate = state.NewWithQuestion(strings.Join([]string{name, "."}, ""), state.QType())
r = newstate.Req
rcode, nextErr := middleware.NextOrFailure(k.Name(), k.Next, ctx, apw, r)
- if !apw.Sent && nextErr == nil {
+ if !(middleware.ClientWrite(rcode) || rcode == dns.RcodeNameError) && nextErr == nil {
r = dnsutil.Dedup(r)
state.SizeAndDo(r)
r, _ = state.Scrub(r)
- apw.ForceWriteMsg(r)
+ apw.WriteMsg(r)
}
return rcode, nextErr
}
diff --git a/middleware/kubernetes/handler_test.go b/middleware/kubernetes/handler_test.go
index dc6b62923..f27caaa99 100644
--- a/middleware/kubernetes/handler_test.go
+++ b/middleware/kubernetes/handler_test.go
@@ -5,7 +5,6 @@ import (
"sort"
"testing"
- "github.com/coredns/coredns/middleware/kubernetes/autopath"
"github.com/coredns/coredns/middleware/pkg/dnsrecorder"
"github.com/coredns/coredns/middleware/test"
@@ -169,97 +168,6 @@ var podModeVerifiedCases = map[string](*test.Case){
},
}
-var autopathCases = map[string](*test.Case){
- "A Autopath Service (Second Search)": {
- Qname: "svc1.testns.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("svc1.testns.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
- test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
- },
- },
- "A Autopath Service (Third Search)": {
- Qname: "svc1.testns.svc.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("svc1.testns.svc.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
- test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
- },
- },
- "A Autopath Next Middleware (Host Domain Search)": {
- Qname: "test1.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("test1.podns.svc.cluster.local. 0 IN CNAME test1.hostdom.test."),
- test.A("test1.hostdom.test. 0 IN A 11.22.33.44"),
- },
- },
- "A Autopath Service (Bare Search)": {
- Qname: "svc1.testns.svc.cluster.local.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("svc1.testns.svc.cluster.local.podns.svc.cluster.local. 0 IN CNAME svc1.testns.svc.cluster.local."),
- test.A("svc1.testns.svc.cluster.local. 0 IN A 10.0.0.1"),
- },
- },
- "A Autopath Next Middleware (Bare Search)": {
- Qname: "test2.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("test2.interwebs.podns.svc.cluster.local. 0 IN CNAME test2.interwebs."),
- test.A("test2.interwebs. 0 IN A 55.66.77.88"),
- },
- },
- "AAAA Autopath Next Middleware (Bare Search)": {
- Qname: "test2.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeAAAA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.CNAME("test2.interwebs.podns.svc.cluster.local. 0 IN CNAME test2.interwebs."),
- test.AAAA("test2.interwebs. 0 IN AAAA 5555:6666:7777::8888"),
- },
- },
-}
-var autopathBareSearch = map[string](*test.Case){
- "A Autopath Next Middleware (Bare Search) Non-existing OnNXDOMAIN default": {
- Qname: "nothere.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{},
- },
-}
-var autopathBareSearchExpectNameErr = map[string](*test.Case){
- "A Autopath Next Middleware (Bare Search) Non-existing OnNXDOMAIN disabled": {
- Qname: "nothere.interwebs.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeNameError,
- Answer: []dns.RR{},
- },
-}
-var autopath2NDotsCases = map[string](*test.Case){
- "A Service (0 Dots)": {
- Qname: "foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeNameError,
- Answer: []dns.RR{},
- Ns: []dns.RR{
- test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"),
- },
- },
- "A Service (1 Dots)": {
- Qname: "foo.foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeNameError,
- Answer: []dns.RR{},
- Ns: []dns.RR{
- test.SOA("cluster.local. 300 IN SOA ns.dns.cluster.local. hostmaster.cluster.local. 1499347823 7200 1800 86400 60"),
- },
- },
- "A Service (2 Dots)": {
- Qname: "foo.foo.foo.podns.svc.cluster.local.", Qtype: dns.TypeA,
- Rcode: dns.RcodeSuccess,
- Answer: []dns.RR{
- test.A("foo.foo.foo.hostdom.test. 0 IN A 11.22.33.44"),
- test.CNAME("foo.foo.foo.podns.svc.cluster.local. 0 IN CNAME foo.foo.foo.hostdom.test."),
- },
- },
-}
-
func TestServeDNS(t *testing.T) {
k := Kubernetes{Zones: []string{"cluster.local."}}
@@ -268,15 +176,11 @@ func TestServeDNS(t *testing.T) {
k.ReverseCidrs = []net.IPNet{*cidr}
k.Federations = []Federation{{name: "fed", zone: "federal.test."}}
k.APIConn = &APIConnServeTest{}
- k.autoPath = new(autopath.AutoPath)
- k.autoPath.HostSearchPath = []string{"hostdom.test"}
k.interfaceAddrsFunc = localPodIP
- k.Next = testHandler(nextMWMap)
+ k.Next = test.NextHandler(dns.RcodeSuccess, nil)
ctx := context.TODO()
runServeDNSTests(ctx, t, dnsTestCases, k)
- runServeDNSTests(ctx, t, autopathCases, k)
- runServeDNSTests(ctx, t, autopathBareSearch, k)
//Set PodMode to Disabled
k.PodMode = PodModeDisabled
@@ -287,21 +191,10 @@ func TestServeDNS(t *testing.T) {
//Set PodMode to Verified
k.PodMode = PodModeVerified
runServeDNSTests(ctx, t, podModeVerifiedCases, k)
-
- // Set ndots to 2 for the ndots test cases
- k.autoPath.NDots = 2
- runServeDNSTests(ctx, t, autopath2NDotsCases, k)
- k.autoPath.NDots = defautNdots
- // Disable the NXDOMAIN override (enabled by default)
- k.autoPath.OnNXDOMAIN = dns.RcodeNameError
- runServeDNSTests(ctx, t, autopathCases, k)
- runServeDNSTests(ctx, t, autopathBareSearchExpectNameErr, k)
-
}
func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string](*test.Case), k Kubernetes) {
for testname, tc := range dnsTestCases {
- testname = "\nTest Case \"" + testname + "\""
r := tc.Msg()
w := dnsrecorder.New(&test.ResponseWriter{})
@@ -316,6 +209,9 @@ func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string
}
resp := w.Msg
+ if resp == nil {
+ t.Fatalf("got nil message and no error for %q: %s %d", testname, r.Question[0].Name, r.Question[0].Qtype)
+ }
// Before sorting, make sure that CNAMES do not appear after their target records
for i, c := range resp.Answer {
@@ -355,48 +251,6 @@ func runServeDNSTests(ctx context.Context, t *testing.T, dnsTestCases map[string
}
}
-// next middleware question->answer map
-
-var nextMWMap = map[dns.Question]dns.Msg{
- {Name: "test1.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.A("test1.hostdom.test. 0 IN A 11.22.33.44")},
- },
- {Name: "test2.interwebs.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.A("test2.interwebs. 0 IN A 55.66.77.88")},
- },
- {Name: "test2.interwebs.", Qtype: dns.TypeAAAA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.AAAA("test2.interwebs. 0 IN AAAA 5555:6666:7777::8888")},
- },
- {Name: "foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.A("foo.hostdom.test. 0 IN A 11.22.33.44")},
- },
- {Name: "foo.foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.A("foo.foo.hostdom.test. 0 IN A 11.22.33.44")},
- },
- {Name: "foo.foo.foo.hostdom.test.", Qtype: dns.TypeA, Qclass: dns.ClassINET}: {
- Answer: []dns.RR{test.A("foo.foo.foo.hostdom.test. 0 IN A 11.22.33.44")},
- },
-}
-
-// testHandler returns a Handler that returns an answer for the question in the
-// request per the question->answer map qMap.
-func testHandler(qMap map[dns.Question]dns.Msg) test.Handler {
- return test.HandlerFunc(func(ctx context.Context, w dns.ResponseWriter, r *dns.Msg) (int, error) {
- m := new(dns.Msg)
- m.SetReply(r)
- msg, ok := qMap[r.Question[0]]
- if !ok {
- r.Rcode = dns.RcodeNameError
- return dns.RcodeNameError, nil
- }
- r.Rcode = dns.RcodeSuccess
- m.Answer = append(m.Answer, msg.Answer...)
- m.Extra = append(m.Extra, msg.Extra...)
- w.WriteMsg(m)
- return dns.RcodeSuccess, nil
- })
-}
-
type APIConnServeTest struct{}
func (APIConnServeTest) Run() { return }
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index 7c5f59f4f..c67ceeb74 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -660,14 +660,6 @@ func localPodIP() net.IP {
return nil
}
-func splitSearch(zone, question, namespace string) (name, search string, ok bool) {
- search = strings.Join([]string{namespace, Svc, zone}, ".")
- if dns.IsSubDomain(search, question) {
- return question[:len(question)-len(search)-1], search, true
- }
- return "", "", false
-}
-
const (
// Svc is the DNS schema for kubernetes services
Svc = "svc"
diff --git a/middleware/kubernetes/kubernetes_test.go b/middleware/kubernetes/kubernetes_test.go
index ae3fbf149..d31e4b9e6 100644
--- a/middleware/kubernetes/kubernetes_test.go
+++ b/middleware/kubernetes/kubernetes_test.go
@@ -459,29 +459,4 @@ func TestServices(t *testing.T) {
}
}
}
-
-}
-
-func TestSplitSearchPath(t *testing.T) {
- type testCase struct {
- question string
- namespace string
- expectedName string
- expectedSearch string
- expectedOk bool
- }
- tests := []testCase{
- {question: "test.blah.com", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
- {question: "foo.com.ns2.svc.interwebs.nets", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
- {question: "foo.com.svc.interwebs.nets", namespace: "ns1", expectedName: "", expectedSearch: "", expectedOk: false},
- {question: "foo.com.ns1.svc.interwebs.nets", namespace: "ns1", expectedName: "foo.com", expectedSearch: "ns1.svc.interwebs.nets", expectedOk: true},
- }
- zone := "interwebs.nets"
- for _, c := range tests {
- name, search, ok := splitSearch(zone, c.question, c.namespace)
- if c.expectedName != name || c.expectedSearch != search || c.expectedOk != ok {
- t.Errorf("Case %v: Expected name'%v', search:'%v', ok:'%v'. Got name:'%v', search:'%v', ok:'%v'.", c.question, c.expectedName, c.expectedSearch, c.expectedOk, name, search, ok)
- }
- }
-
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-07-23 09:47:08 +0000