TrueCloudLab/coredns
16
0
Fork 2
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

plugin/k8s_external/kubernetes: handle NS records (#3160)

Browse source 
* fix external ns records

* use k8s service name for ns record

* update test, add func comment

* expand nsAddrs() test cases

* support local ipv6 ip

* use less confusing pod ip in test
This commit is contained in:
Chris O'Haver 2019-08-23 12:54:06 -04:00 • committed by Miek Gieben
parent 84988ce2c2
commit 338d148c78
6 changed files with 180 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

98
plugin/kubernetes/ns_test.go
View file

@ -1,9 +1,11 @@
package kubernetes
import (
"net"
"testing"
"github.com/coredns/coredns/plugin/kubernetes/object"
"github.com/miekg/dns"
api "k8s.io/api/core/v1"
)
@ -14,12 +16,23 @@ func (APIConnTest) HasSynced() bool { return true }
func (APIConnTest) Run() { return }
func (APIConnTest) Stop() error { return nil }
func (APIConnTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnTest) SvcIndex(string) []*object.Service { return nil }
func (APIConnTest) SvcIndexReverse(string) []*object.Service { return nil }
func (APIConnTest) EpIndex(string) []*object.Endpoints { return nil }
func (APIConnTest) EndpointsList() []*object.Endpoints { return nil }
func (APIConnTest) Modified() int64 { return 0 }
func (a APIConnTest) SvcIndex(s string) []*object.Service {
switch s {
case "dns-service.kube-system":
return []*object.Service{a.ServiceList()[0]}
case "hdls-dns-service.kube-system":
return []*object.Service{a.ServiceList()[1]}
case "dns6-service.kube-system":
return []*object.Service{a.ServiceList()[2]}
}
return nil
}
func (APIConnTest) ServiceList() []*object.Service {
svcs := []*object.Service{
{
@ -27,18 +40,31 @@ func (APIConnTest) ServiceList() []*object.Service {
Namespace: "kube-system",
ClusterIP: "10.0.0.111",
},
{
Name: "hdls-dns-service",
Namespace: "kube-system",
ClusterIP: api.ClusterIPNone,
},
{
Name: "dns6-service",
Namespace: "kube-system",
ClusterIP: "10::111",
},
}
return svcs
}
func (APIConnTest) EpIndexReverse(string) []*object.Endpoints {
func (APIConnTest) EpIndexReverse(ip string) []*object.Endpoints {
if ip != "10.244.0.20" {
return nil
}
eps := []*object.Endpoints{
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{
IP: "127.0.0.1",
IP: "10.244.0.20",
},
},
},
@ -46,6 +72,32 @@ func (APIConnTest) EpIndexReverse(string) []*object.Endpoints {
Name: "dns-service",
Namespace: "kube-system",
},
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{
IP: "10.244.0.20",
},
},
},
},
Name: "hdls-dns-service",
Namespace: "kube-system",
},
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{
IP: "10.244.0.20",
},
},
},
},
Name: "dns6-service",
Namespace: "kube-system",
},
}
return eps
}
@ -55,19 +107,43 @@ func (APIConnTest) GetNamespaceByName(name string) (*api.Namespace, error) {
return &api.Namespace{}, nil
}
func TestNsAddr(t *testing.T) {
func TestNsAddrs(t *testing.T) {
k := New([]string{"inter.webs.test."})
k.APIConn = &APIConnTest{}
k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("10.244.0.20") }
cdr := k.nsAddr()
expected := "10.0.0.111"
cdrs := k.nsAddrs(false, k.Zones[0])
if len(cdrs) != 3 {
t.Fatalf("Expected 3 results, got %v", len(cdrs))
if cdr.A.String() != expected {
t.Errorf("Expected A to be %q, got %q", expected, cdr.A.String())
}
expected = "dns-service.kube-system.svc."
if cdr.Hdr.Name != expected {
t.Errorf("Expected Hdr.Name to be %q, got %q", expected, cdr.Hdr.Name)
cdr := cdrs[0]
expected := "10.0.0.111"
if cdr.(*dns.A).A.String() != expected {
t.Errorf("Expected 1st A to be %q, got %q", expected, cdr.(*dns.A).A.String())
}
expected = "dns-service.kube-system.svc.inter.webs.test."
if cdr.Header().Name != expected {
t.Errorf("Expected 1st Header Name to be %q, got %q", expected, cdr.Header().Name)
}
cdr = cdrs[1]
expected = "10.244.0.20"
if cdr.(*dns.A).A.String() != expected {
t.Errorf("Expected 2nd A to be %q, got %q", expected, cdr.(*dns.A).A.String())
}
expected = "10-244-0-20.hdls-dns-service.kube-system.svc.inter.webs.test."
if cdr.Header().Name != expected {
t.Errorf("Expected 2nd Header Name to be %q, got %q", expected, cdr.Header().Name)
}
cdr = cdrs[2]
expected = "10::111"
if cdr.(*dns.AAAA).AAAA.String() != expected {
t.Errorf("Expected AAAA to be %q, got %q", expected, cdr.(*dns.A).A.String())
}
expected = "dns6-service.kube-system.svc.inter.webs.test."
if cdr.Header().Name != expected {
t.Errorf("Expected AAAA Header Name to be %q, got %q", expected, cdr.Header().Name)
}
}