7e56cc74e5
* 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
101 lines
3.3 KiB
Go
101 lines
3.3 KiB
Go
package kubernetes
|
|
|
|
import (
|
|
"net"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/coredns/coredns/middleware/etcd/msg"
|
|
"github.com/miekg/dns"
|
|
"k8s.io/client-go/1.5/pkg/api"
|
|
)
|
|
|
|
func testStripFederation(t *testing.T, k Kubernetes, input []string, expectedFed string, expectedSegs string) {
|
|
fed, segs := k.stripFederation(input)
|
|
|
|
if expectedSegs != strings.Join(segs, ".") {
|
|
t.Errorf("For '%v', expected segs result '%v'. Instead got result '%v'.", strings.Join(input, "."), expectedSegs, strings.Join(segs, "."))
|
|
}
|
|
if expectedFed != fed {
|
|
t.Errorf("For '%v', expected fed result '%v'. Instead got result '%v'.", strings.Join(input, "."), expectedFed, fed)
|
|
}
|
|
}
|
|
|
|
func TestStripFederation(t *testing.T) {
|
|
k := Kubernetes{Zones: []string{"inter.webs.test"}}
|
|
k.Federations = []Federation{{name: "fed", zone: "era.tion.com"}}
|
|
|
|
testStripFederation(t, k, []string{"service", "ns", "fed", Svc}, "fed", "service.ns.svc")
|
|
testStripFederation(t, k, []string{"service", "ns", "foo", Svc}, "", "service.ns.foo.svc")
|
|
testStripFederation(t, k, []string{"foo", "bar"}, "", "foo.bar")
|
|
|
|
}
|
|
|
|
type apiConnFedTest struct{}
|
|
|
|
func (apiConnFedTest) Run() { return }
|
|
func (apiConnFedTest) Stop() error { return nil }
|
|
func (apiConnFedTest) ServiceList() []*api.Service { return []*api.Service{} }
|
|
func (apiConnFedTest) PodIndex(string) []interface{} { return nil }
|
|
|
|
func (apiConnFedTest) EndpointsList() api.EndpointsList {
|
|
n := "test.node.foo.bar"
|
|
return api.EndpointsList{
|
|
Items: []api.Endpoints{
|
|
{
|
|
Subsets: []api.EndpointSubset{
|
|
{
|
|
Addresses: []api.EndpointAddress{
|
|
{
|
|
IP: "10.9.8.7",
|
|
NodeName: &n,
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
},
|
|
}
|
|
}
|
|
|
|
func (apiConnFedTest) GetNodeByName(name string) (api.Node, error) {
|
|
if name != "test.node.foo.bar" {
|
|
return api.Node{}, nil
|
|
}
|
|
return api.Node{
|
|
ObjectMeta: api.ObjectMeta{
|
|
Name: "test.node.foo.bar",
|
|
Labels: map[string]string{
|
|
labelRegion: "fd-r",
|
|
labelAvailabilityZone: "fd-az",
|
|
},
|
|
},
|
|
}, nil
|
|
}
|
|
|
|
func testFederationCNAMERecord(t *testing.T, k Kubernetes, input recordRequest, expected msg.Service) {
|
|
svc := k.federationCNAMERecord(input)
|
|
|
|
if expected.Host != svc.Host {
|
|
t.Errorf("For '%v', expected Host result '%v'. Instead got result '%v'.", input, expected.Host, svc.Host)
|
|
}
|
|
if expected.Key != svc.Key {
|
|
t.Errorf("For '%v', expected Key result '%v'. Instead got result '%v'.", input, expected.Key, svc.Key)
|
|
}
|
|
}
|
|
|
|
func TestFederationCNAMERecord(t *testing.T) {
|
|
k := Kubernetes{Zones: []string{"inter.webs."}}
|
|
k.Federations = []Federation{{name: "fed", zone: "era.tion.com"}}
|
|
k.APIConn = apiConnFedTest{}
|
|
k.interfaceAddrsFunc = func() net.IP { return net.ParseIP("10.9.8.7") }
|
|
|
|
r, _ := k.parseRequest("s1.ns.fed.svc.inter.webs.", dns.TypeA, "inter.webs.")
|
|
testFederationCNAMERecord(t, k, r, msg.Service{Key: "/coredns/webs/inter/svc/fed/ns/s1", Host: "s1.ns.fed.svc.fd-az.fd-r.era.tion.com"})
|
|
|
|
r, _ = k.parseRequest("ep1.s1.ns.fed.svc.inter.webs.", dns.TypeA, "inter.webs.")
|
|
testFederationCNAMERecord(t, k, r, msg.Service{Key: "/coredns/webs/inter/svc/fed/ns/s1/ep1", Host: "ep1.s1.ns.fed.svc.fd-az.fd-r.era.tion.com"})
|
|
|
|
r, _ = k.parseRequest("ep1.s1.ns.foo.svc.inter.webs.", dns.TypeA, "inter.webs.")
|
|
testFederationCNAMERecord(t, k, r, msg.Service{Key: "", Host: ""})
|
|
}
|