From a78f46fb28aa4a8c533f40b7bd808b09572f7e66 Mon Sep 17 00:00:00 2001 From: Chris O'Haver Date: Fri, 10 Nov 2017 11:59:21 -0500 Subject: plugin/k8s: Use service IP index in reverse lookups (#1212) * use index for svc reverse lookup * temp revert * restore reverse.go * restore reverse_test.go --- plugin/kubernetes/reverse_test.go | 35 ++++++++++++++++++++++++----------- 1 file changed, 24 insertions(+), 11 deletions(-) (limited to 'plugin/kubernetes/reverse_test.go') diff --git a/plugin/kubernetes/reverse_test.go b/plugin/kubernetes/reverse_test.go index 7a5435181..604dff0c9 100644 --- a/plugin/kubernetes/reverse_test.go +++ b/plugin/kubernetes/reverse_test.go @@ -14,16 +14,19 @@ import ( type APIConnReverseTest struct{} -func (APIConnReverseTest) HasSynced() bool { return true } -func (APIConnReverseTest) Run() { return } -func (APIConnReverseTest) Stop() error { return nil } -func (APIConnReverseTest) PodIndex(string) []*api.Pod { return nil } -func (APIConnReverseTest) SvcIndex(string) []*api.Service { return nil } -func (APIConnReverseTest) SvcIndexReverse(string) []*api.Service { return nil } -func (APIConnReverseTest) EpIndex(string) []*api.Endpoints { return nil } -func (APIConnReverseTest) EndpointsList() []*api.Endpoints { return nil } +func (APIConnReverseTest) HasSynced() bool { return true } +func (APIConnReverseTest) Run() { return } +func (APIConnReverseTest) Stop() error { return nil } +func (APIConnReverseTest) PodIndex(string) []*api.Pod { return nil } +func (APIConnReverseTest) SvcIndex(string) []*api.Service { return nil } +func (APIConnReverseTest) EpIndex(string) []*api.Endpoints { return nil } +func (APIConnReverseTest) EndpointsList() []*api.Endpoints { return nil } +func (APIConnReverseTest) ServiceList() []*api.Service { return nil } -func (APIConnReverseTest) ServiceList() []*api.Service { +func (APIConnReverseTest) SvcIndexReverse(ip string) []*api.Service { + if ip != "192.168.1.100" { + return nil + } svcs := []*api.Service{ { ObjectMeta: meta.ObjectMeta{ @@ -43,7 +46,10 @@ func (APIConnReverseTest) ServiceList() []*api.Service { return svcs } -func (APIConnReverseTest) EpIndexReverse(string) []*api.Endpoints { +func (APIConnReverseTest) EpIndexReverse(ip string) []*api.Endpoints { + if ip != "10.0.0.100" { + return nil + } eps := []*api.Endpoints{ { Subsets: []api.EndpointSubset{ @@ -82,7 +88,7 @@ func (APIConnReverseTest) GetNodeByName(name string) (*api.Node, error) { func TestReverse(t *testing.T) { - k := New([]string{"cluster.local.", "0.10.in-addr.arpa."}) + k := New([]string{"cluster.local.", "0.10.in-addr.arpa.", "168.192.in-addr.arpa."}) k.APIConn = &APIConnReverseTest{} tests := []test.Case{ @@ -93,6 +99,13 @@ func TestReverse(t *testing.T) { test.PTR("100.0.0.10.in-addr.arpa. 303 IN PTR ep1a.svc1.testns.svc.cluster.local."), }, }, + { + Qname: "100.1.168.192.in-addr.arpa.", Qtype: dns.TypePTR, + Rcode: dns.RcodeSuccess, + Answer: []dns.RR{ + test.PTR("100.1.168.192.in-addr.arpa. 303 IN PTR svc1.testns.svc.cluster.local."), + }, + }, { Qname: "101.0.0.10.in-addr.arpa.", Qtype: dns.TypePTR, Rcode: dns.RcodeSuccess, -- cgit v1.2.3