diff options
Diffstat (limited to 'plugin/kubernetes')
| -rw-r--r-- | plugin/kubernetes/handler_test.go | 24 | ||||
| -rw-r--r-- | plugin/kubernetes/parse_test.go | 12 |
2 files changed, 30 insertions, 6 deletions
diff --git a/plugin/kubernetes/handler_test.go b/plugin/kubernetes/handler_test.go index 2edeb8e8e..435dcb1b6 100644 --- a/plugin/kubernetes/handler_test.go +++ b/plugin/kubernetes/handler_test.go @@ -183,6 +183,15 @@ var dnsTestCases = []test.Case{ test.CNAME("external.testns.svc.cluster.local. 5 IN CNAME ext.interwebs.test."), }, }, + // CNAME External To Internal Service + { + Qname: "external-to-service.testns.svc.cluster.local", Qtype: dns.TypeA, + Rcode: dns.RcodeSuccess, + Answer: []dns.RR{ + test.CNAME("external-to-service.testns.svc.cluster.local. 5 IN CNAME svc1.testns.svc.cluster.local."), + test.A("svc1.testns.svc.cluster.local. 5 IN A 10.0.0.1"), + }, + }, // AAAA Service (with an existing A record, but no AAAA record) { Qname: "svc1.testns.svc.cluster.local.", Qtype: dns.TypeAAAA, @@ -420,6 +429,21 @@ var svcIndex = map[string][]*api.Service{ Type: api.ServiceTypeExternalName, }, }}, + "external-to-service.testns": {{ + ObjectMeta: meta.ObjectMeta{ + Name: "external-to-service", + Namespace: "testns", + }, + Spec: api.ServiceSpec{ + ExternalName: "svc1.testns.svc.cluster.local.", + Ports: []api.ServicePort{{ + Name: "http", + Protocol: "tcp", + Port: 80, + }}, + Type: api.ServiceTypeExternalName, + }, + }}, } func (APIConnServeTest) SvcIndex(s string) []*api.Service { diff --git a/plugin/kubernetes/parse_test.go b/plugin/kubernetes/parse_test.go index 7907afc65..0ce4b7d98 100644 --- a/plugin/kubernetes/parse_test.go +++ b/plugin/kubernetes/parse_test.go @@ -14,17 +14,17 @@ func TestParseRequest(t *testing.T) { expected string // output from r.String() }{ // valid SRV request - {"_http._tcp.webs.mynamespace.svc.inter.webs.test.", "http.tcp..webs.mynamespace.svc"}, + {"_http._tcp.webs.mynamespace.svc.inter.webs.tests.", "http.tcp..webs.mynamespace.svc"}, // wildcard acceptance - {"*.any.*.any.svc.inter.webs.test.", "*.any..*.any.svc"}, + {"*.any.*.any.svc.inter.webs.tests.", "*.any..*.any.svc"}, // A request of endpoint - {"1-2-3-4.webs.mynamespace.svc.inter.webs.test.", "*.*.1-2-3-4.webs.mynamespace.svc"}, + {"1-2-3-4.webs.mynamespace.svc.inter.webs.tests.", "*.*.1-2-3-4.webs.mynamespace.svc"}, // bare zone - {"inter.webs.test.", "....."}, + {"inter.webs.tests.", "....."}, // bare svc type - {"svc.inter.webs.test.", "....."}, + {"svc.inter.webs.tests.", "....."}, // bare pod type - {"pod.inter.webs.test.", "....."}, + {"pod.inter.webs.tests.", "....."}, } for i, tc := range tests { m := new(dns.Msg) |