diff options
| author |  Miek Gieben <miek@miek.nl>
| 2017-08-10 01:08:58 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2017-08-10 01:08:58 -0700 |
| commit | 7e56cc74e5420bfc1670ddf858420909fdaf3fee (patch) | |
| tree | b8d2992c476a57c11082239c9501761f19f52ef8 /middleware/kubernetes/ns_test.go | |
| parent | fefc4374d72086d6325019471677a6ae73622a63 (diff) | |
| download | coredns-7e56cc74e5420bfc1670ddf858420909fdaf3fee.tar.gz coredns-7e56cc74e5420bfc1670ddf858420909fdaf3fee.tar.zst coredns-7e56cc74e5420bfc1670ddf858420909fdaf3fee.zip | |
WIP: Parserequest2 cutback (#868)
* middleware/kubernetes: pull TXT out of parseRequest
Put the TXT handling one layer higher and remove it from parseRequest.
Also rename the podsvc field in there to podOrSvc. Now that it isn't
used anymore for TXT record (dns-version) that was put in there. We can
make this a boolean (in a future PR).
Make parseRequest get an optional Zone that is from state.Zone and use
that instead of its own code. Removed some tests and other smaller
cleanups.
Fixes #836
* add this reverse
* another check
* readd
* Rename to kPod and kService for some clarity
Diffstat (limited to 'middleware/kubernetes/ns_test.go')
| -rw-r--r-- | middleware/kubernetes/ns_test.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/middleware/kubernetes/ns_test.go b/middleware/kubernetes/ns_test.go index 1aa4f910d..b7e2ae513 100644 --- a/middleware/kubernetes/ns_test.go +++ b/middleware/kubernetes/ns_test.go @@ -7,10 +7,10 @@ import "k8s.io/client-go/1.5/pkg/api" import "github.com/miekg/dns" func TestRecordForNS(t *testing.T) { - k := Kubernetes{Zones: []string{"inter.webs.test"}} + k := Kubernetes{Zones: []string{"inter.webs.test."}} corednsRecord.Hdr.Name = "coredns.kube-system." corednsRecord.A = net.IP("1.2.3.4") - r, _ := k.parseRequest("inter.webs.test", dns.TypeNS) + r, _ := k.parseRequest("inter.webs.test.", dns.TypeNS, "inter.webs.test.") expected := "/coredns/test/webs/inter/kube-system/coredns" svc := k.recordsForNS(r) @@ -20,10 +20,10 @@ func TestRecordForNS(t *testing.T) { } func TestDefaultNSMsg(t *testing.T) { - k := Kubernetes{Zones: []string{"inter.webs.test"}} + k := Kubernetes{Zones: []string{"inter.webs.test."}} corednsRecord.Hdr.Name = "coredns.kube-system." corednsRecord.A = net.IP("1.2.3.4") - r, _ := k.parseRequest("ns.dns.inter.webs.test", dns.TypeA) + r, _ := k.parseRequest("ns.dns.inter.webs.test.", dns.TypeA, "inter.webs.test.") expected := "/coredns/test/webs/inter/dns/ns" svc := k.defaultNSMsg(r) @@ -33,13 +33,13 @@ func TestDefaultNSMsg(t *testing.T) { } func TestIsDefaultNS(t *testing.T) { - k := Kubernetes{Zones: []string{"inter.webs.test"}} - r, _ := k.parseRequest("ns.dns.inter.webs.test", dns.TypeA) + k := Kubernetes{Zones: []string{"inter.webs.test."}} + r, _ := k.parseRequest("ns.dns.inter.webs.test", dns.TypeA, "inter.webs.test.") var name string var expected bool - name = "ns.dns.inter.webs.test" + name = "ns.dns.inter.webs.test." expected = true if isDefaultNS(name, r) != expected { t.Errorf("Expected IsDefaultNS('%v') to be '%v'.", name, expected) |