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

Revert "use keys (#2167)" (#2188)

Browse source 
This reverts commit 974ed086f2.
This commit is contained in:
Miek Gieben 2018-10-11 21:59:50 +01:00 • committed by Chris O'Haver
parent c8fb66f8cc
commit 6ed88fab74
13 changed files with 380 additions and 291 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
plugin/federation/kubernetes_api_test.go
View file

@ -16,24 +16,22 @@ type APIConnFederationTest struct {
func (APIConnFederationTest) HasSynced() bool { return true }
func (APIConnFederationTest) Run() { return }
func (APIConnFederationTest) Stop() error { return nil }
func (APIConnFederationTest) SvcIndexReverse(string) *object.Service { return nil }
func (APIConnFederationTest) EpIndexReverse(string) *object.Endpoints { return nil }
func (APIConnFederationTest) SvcIndexReverse(string) []*object.Service { return nil }
func (APIConnFederationTest) EpIndexReverse(string) []*object.Endpoints { return nil }
func (APIConnFederationTest) Modified() int64 { return 0 }
func (APIConnFederationTest) SetWatchChan(watch.Chan) {}
func (APIConnFederationTest) Watch(string) error { return nil }
func (APIConnFederationTest) StopWatching(string) {}
func (APIConnFederationTest) PodIndex(string) []*object.Pod {
return []*object.Pod{
{Namespace: "podns", PodIP: "10.240.0.1"}, // Remote IP set in test.ResponseWriter
}
}
func (APIConnFederationTest) SvcIndex(key string) *object.Service {
svcs := map[string]*object.Service{
"testns/svc1": {
func (APIConnFederationTest) SvcIndex(string) []*object.Service {
svcs := []*object.Service{
{
Name: "svc1",
Namespace: "testns",
ClusterIP: "10.0.0.1",
@ -41,12 +39,12 @@ func (APIConnFederationTest) SvcIndex(key string) *object.Service {
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/hdls1": {
{
Name: "hdls1",
Namespace: "testns",
ClusterIP: api.ClusterIPNone,
},
"testns/external": {
{
Name: "external",
Namespace: "testns",
ExternalName: "ext.interwebs.test",
@ -55,10 +53,9 @@ func (APIConnFederationTest) SvcIndex(key string) *object.Service {
},
},
}
return svcs[key]
return svcs
}
func (APIConnFederationTest) ServiceList() []*object.Service {
svcs := []*object.Service{
{
@ -86,9 +83,9 @@ func (APIConnFederationTest) ServiceList() []*object.Service {
return svcs
}
func (APIConnFederationTest) EpIndex(key string) *object.Endpoints {
eps := map[string]*object.Endpoints{
"testns/svc1": {
func (APIConnFederationTest) EpIndex(string) []*object.Endpoints {
eps := []*object.Endpoints{
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -103,7 +100,7 @@ func (APIConnFederationTest) EpIndex(key string) *object.Endpoints {
Namespace: "testns",
},
}
return eps[key]
return eps
}
func (APIConnFederationTest) EndpointsList() []*object.Endpoints {

76
plugin/kubernetes/controller.go
View file

@ -21,18 +21,20 @@ import (
const (
podIPIndex = "PodIP"
svcNameNamespaceIndex = "NameNamespace"
svcIPIndex = "ServiceIP"
epNameNamespaceIndex = "EndpointNameNamespace"
epIPIndex = "EndpointsIP"
)
type dnsController interface {
ServiceList() []*object.Service
EndpointsList() []*object.Endpoints
SvcIndex(string) *object.Service
SvcIndexReverse(string) *object.Service
SvcIndex(string) []*object.Service
SvcIndexReverse(string) []*object.Service
PodIndex(string) []*object.Pod
EpIndex(string) *object.Endpoints
EpIndexReverse(string) *object.Endpoints
EpIndex(string) []*object.Endpoints
EpIndexReverse(string) []*object.Endpoints
GetNodeByName(string) (*api.Node, error)
GetNamespaceByName(string) (*api.Namespace, error)
@ -116,7 +118,7 @@ func newdnsController(kubeClient kubernetes.Interface, opts dnsControlOpts) *dns
&object.Service{},
opts.resyncPeriod,
cache.ResourceEventHandlerFuncs{AddFunc: dns.Add, UpdateFunc: dns.Update, DeleteFunc: dns.Delete},
cache.Indexers{svcIPIndex: svcIPIndexFunc},
cache.Indexers{svcNameNamespaceIndex: svcNameNamespaceIndexFunc, svcIPIndex: svcIPIndexFunc},
object.ToService,
)
@ -143,7 +145,7 @@ func newdnsController(kubeClient kubernetes.Interface, opts dnsControlOpts) *dns
&api.Endpoints{},
opts.resyncPeriod,
cache.ResourceEventHandlerFuncs{AddFunc: dns.Add, UpdateFunc: dns.Update, DeleteFunc: dns.Delete},
cache.Indexers{epIPIndex: epIPIndexFunc},
cache.Indexers{epNameNamespaceIndex: epNameNamespaceIndexFunc, epIPIndex: epIPIndexFunc},
object.ToEndpoints)
}
@ -173,6 +175,22 @@ func svcIPIndexFunc(obj interface{}) ([]string, error) {
return []string{svc.ClusterIP}, nil
}
func svcNameNamespaceIndexFunc(obj interface{}) ([]string, error) {
s, ok := obj.(*object.Service)
if !ok {
return nil, errObj
}
return []string{s.Index}, nil
}
func epNameNamespaceIndexFunc(obj interface{}) ([]string, error) {
s, ok := obj.(*object.Endpoints)
if !ok {
return nil, errObj
}
return []string{s.Index}, nil
}
func epIPIndexFunc(obj interface{}) ([]string, error) {
ep, ok := obj.(*object.Endpoints)
if !ok {
@ -341,9 +359,6 @@ func (dns *dnsControl) EndpointsList() (eps []*object.Endpoints) {
}
func (dns *dnsControl) PodIndex(ip string) (pods []*object.Pod) {
if dns.podLister == nil {
return nil
}
os, err := dns.podLister.ByIndex(podIPIndex, ip)
if err != nil {
return nil
@ -353,24 +368,27 @@ func (dns *dnsControl) PodIndex(ip string) (pods []*object.Pod) {
if !ok {
continue
}
return []*object.Pod{p}
pods = append(pods, p)
}
return nil
return pods
}
func (dns *dnsControl) SvcIndex(key string) *object.Service {
o, _, err := dns.svcLister.GetByKey(key)
func (dns *dnsControl) SvcIndex(idx string) (svcs []*object.Service) {
os, err := dns.svcLister.ByIndex(svcNameNamespaceIndex, idx)
if err != nil {
return nil
}
for _, o := range os {
s, ok := o.(*object.Service)
if !ok {
return nil
continue
}
return s
svcs = append(svcs, s)
}
return svcs
}
func (dns *dnsControl) SvcIndexReverse(ip string) *object.Service {
func (dns *dnsControl) SvcIndexReverse(ip string) (svcs []*object.Service) {
os, err := dns.svcLister.ByIndex(svcIPIndex, ip)
if err != nil {
return nil
@ -381,27 +399,27 @@ func (dns *dnsControl) SvcIndexReverse(ip string) *object.Service {
if !ok {
continue
}
return s
svcs = append(svcs, s)
}
return nil
return svcs
}
func (dns *dnsControl) EpIndex(key string) (ep *object.Endpoints) {
o, _, err := dns.epLister.GetByKey(key)
func (dns *dnsControl) EpIndex(idx string) (ep []*object.Endpoints) {
os, err := dns.epLister.ByIndex(epNameNamespaceIndex, idx)
if err != nil {
return nil
}
for _, o := range os {
e, ok := o.(*object.Endpoints)
if !ok {
return nil
continue
}
return e
ep = append(ep, e)
}
return ep
}
func (dns *dnsControl) EpIndexReverse(ip string) (ep *object.Endpoints) {
if dns.epLister == nil {
return nil
}
func (dns *dnsControl) EpIndexReverse(ip string) (ep []*object.Endpoints) {
os, err := dns.epLister.ByIndex(epIPIndex, ip)
if err != nil {
return nil
@ -411,9 +429,9 @@ func (dns *dnsControl) EpIndexReverse(ip string) (ep *object.Endpoints) {
if !ok {
continue
}
return e
ep = append(ep, e)
}
return nil
return ep
}
// GetNodeByName return the node by name. If nothing is found an error is
@ -432,7 +450,7 @@ func (dns *dnsControl) GetNamespaceByName(name string) (*api.Namespace, error) {
if !ok {
continue
}
if name == ns.GetName() {
if name == ns.ObjectMeta.Name {
return ns, nil
}
}

67
plugin/kubernetes/handler_test.go
View file

@ -382,8 +382,8 @@ type APIConnServeTest struct{}
func (APIConnServeTest) HasSynced() bool { return true }
func (APIConnServeTest) Run() { return }
func (APIConnServeTest) Stop() error { return nil }
func (APIConnServeTest) EpIndexReverse(string) *object.Endpoints { return nil }
func (APIConnServeTest) SvcIndexReverse(string) *object.Service { return nil }
func (APIConnServeTest) EpIndexReverse(string) []*object.Endpoints { return nil }
func (APIConnServeTest) SvcIndexReverse(string) []*object.Service { return nil }
func (APIConnServeTest) Modified() int64 { return time.Now().Unix() }
func (APIConnServeTest) SetWatchChan(watch.Chan) {}
func (APIConnServeTest) Watch(string) error { return nil }
@ -396,8 +396,9 @@ func (APIConnServeTest) PodIndex(string) []*object.Pod {
return a
}
var svcIndex = map[string]*object.Service{
"testns/svc1": {
var svcIndex = map[string][]*object.Service{
"svc1.testns": {
{
Name: "svc1",
Namespace: "testns",
Type: api.ServiceTypeClusterIP,
@ -406,7 +407,9 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/svcempty": {
},
"svcempty.testns": {
{
Name: "svcempty",
Namespace: "testns",
Type: api.ServiceTypeClusterIP,
@ -415,7 +418,9 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/svc6": {
},
"svc6.testns": {
{
Name: "svc6",
Namespace: "testns",
Type: api.ServiceTypeClusterIP,
@ -424,14 +429,17 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/hdls1": {
},
"hdls1.testns": {
{
Name: "hdls1",
Namespace: "testns",
Type: api.ServiceTypeClusterIP,
ClusterIP: api.ClusterIPNone,
},
"testns/external": {
},
"external.testns": {
{
Name: "external",
Namespace: "testns",
ExternalName: "ext.interwebs.test",
@ -440,7 +448,9 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/external-to-service": {
},
"external-to-service.testns": {
{
Name: "external-to-service",
Namespace: "testns",
ExternalName: "svc1.testns.svc.cluster.local.",
@ -449,13 +459,17 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
"testns/hdlsprtls": {
},
"hdlsprtls.testns": {
{
Name: "hdlsprtls",
Namespace: "testns",
Type: api.ServiceTypeClusterIP,
ClusterIP: api.ClusterIPNone,
},
"unexposedns/svc1": {
},
"svc1.unexposedns": {
{
Name: "svc1",
Namespace: "unexposedns",
Type: api.ServiceTypeClusterIP,
@ -464,22 +478,21 @@ var svcIndex = map[string]*object.Service{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
},
}
func (APIConnServeTest) SvcIndex(s string) *object.Service {
return svcIndex[s]
}
func (APIConnServeTest) SvcIndex(s string) []*object.Service { return svcIndex[s] }
func (APIConnServeTest) ServiceList() []*object.Service {
var svcs []*object.Service
for _, svc := range svcIndex {
svcs = append(svcs, svc)
svcs = append(svcs, svc...)
}
return svcs
}
var epsIndex = map[string]*object.Endpoints{
"testns/svc1": {
var epsIndex = map[string][]*object.Endpoints{
"svc1.testns": {{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -492,8 +505,8 @@ var epsIndex = map[string]*object.Endpoints{
},
Name: "svc1",
Namespace: "testns",
},
"testns/svcempty": {
}},
"svcempty.testns": {{
Subsets: []object.EndpointSubset{
{
Addresses: nil,
@ -504,8 +517,8 @@ var epsIndex = map[string]*object.Endpoints{
},
Name: "svcempty",
Namespace: "testns",
},
"testns/hdls1": {
}},
"hdls1.testns": {{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -523,8 +536,8 @@ var epsIndex = map[string]*object.Endpoints{
},
Name: "hdls1",
Namespace: "testns",
},
"testns/hdlsprtls": {
}},
"hdlsprtls.testns": {{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -535,17 +548,17 @@ var epsIndex = map[string]*object.Endpoints{
},
Name: "hdlsprtls",
Namespace: "testns",
},
}},
}
func (APIConnServeTest) EpIndex(s string) *object.Endpoints {
func (APIConnServeTest) EpIndex(s string) []*object.Endpoints {
return epsIndex[s]
}
func (APIConnServeTest) EndpointsList() []*object.Endpoints {
var eps []*object.Endpoints
for _, ep := range epsIndex {
eps = append(eps, ep)
eps = append(eps, ep...)
}
return eps
}

9
plugin/kubernetes/kubernetes.go
View file

@ -444,12 +444,9 @@ func (k *Kubernetes) findServices(r recordRequest, zone string) (services []msg.
serviceList = k.APIConn.ServiceList()
endpointsListFunc = func() []*object.Endpoints { return k.APIConn.EndpointsList() }
} else {
key := object.ServiceKey(r.namespace, r.service)
s := k.APIConn.SvcIndex(key)
if s != nil {
serviceList = append(serviceList, s)
}
endpointsListFunc = func() []*object.Endpoints { return []*object.Endpoints{k.APIConn.EpIndex(key)} }
idx := object.ServiceKey(r.service, r.namespace)
serviceList = k.APIConn.SvcIndex(idx)
endpointsListFunc = func() []*object.Endpoints { return k.APIConn.EpIndex(idx) }
}
for _, svc := range serviceList {

99
plugin/kubernetes/kubernetes_test.go
View file

@ -63,20 +63,39 @@ func (APIConnServiceTest) HasSynced() bool { return true
func (APIConnServiceTest) Run() { return }
func (APIConnServiceTest) Stop() error { return nil }
func (APIConnServiceTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnServiceTest) SvcIndexReverse(string) *object.Service { return nil }
func (APIConnServiceTest) EpIndexReverse(string) *object.Endpoints { return nil }
func (APIConnServiceTest) SvcIndexReverse(string) []*object.Service { return nil }
func (APIConnServiceTest) EpIndexReverse(string) []*object.Endpoints { return nil }
func (APIConnServiceTest) Modified() int64 { return 0 }
func (APIConnServiceTest) SetWatchChan(watch.Chan) {}
func (APIConnServiceTest) Watch(string) error { return nil }
func (APIConnServiceTest) StopWatching(string) {}
func (a APIConnServiceTest) SvcIndex(key string) *object.Service {
for _, s := range a.ServiceList() {
if object.ServiceKey(s.Namespace, s.Name) == key {
return s
func (APIConnServiceTest) SvcIndex(string) []*object.Service {
svcs := []*object.Service{
{
Name: "svc1",
Namespace: "testns",
ClusterIP: "10.0.0.1",
Ports: []api.ServicePort{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
{
Name: "hdls1",
Namespace: "testns",
ClusterIP: api.ClusterIPNone,
},
{
Name: "external",
Namespace: "testns",
ExternalName: "coredns.io",
Type: api.ServiceTypeExternalName,
Ports: []api.ServicePort{
{Name: "http", Protocol: "tcp", Port: 80},
},
},
}
}
return nil
return svcs
}
func (APIConnServiceTest) ServiceList() []*object.Service {
@ -107,13 +126,61 @@ func (APIConnServiceTest) ServiceList() []*object.Service {
return svcs
}
func (a APIConnServiceTest) EpIndex(key string) *object.Endpoints {
for _, e := range a.EndpointsList() {
if object.EndpointsKey(e.Namespace, e.Name) == key {
return e
func (APIConnServiceTest) EpIndex(string) []*object.Endpoints {
eps := []*object.Endpoints{
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{IP: "172.0.0.1", Hostname: "ep1a"},
},
Ports: []object.EndpointPort{
{Port: 80, Protocol: "tcp", Name: "http"},
},
},
},
Name: "svc1",
Namespace: "testns",
},
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{IP: "172.0.0.2"},
},
Ports: []object.EndpointPort{
{Port: 80, Protocol: "tcp", Name: "http"},
},
},
},
Name: "hdls1",
Namespace: "testns",
},
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{IP: "172.0.0.3"},
},
Ports: []object.EndpointPort{
{Port: 80, Protocol: "tcp", Name: "http"},
},
},
},
Name: "hdls1",
Namespace: "testns",
},
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
{IP: "10.9.8.7", NodeName: "test.node.foo.bar"},
},
},
},
},
}
}
return nil
return eps
}
func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
@ -157,7 +224,7 @@ func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
},
},
},
Name: "hdls2",
Name: "hdls1",
Namespace: "testns",
},
{
@ -168,8 +235,6 @@ func (APIConnServiceTest) EndpointsList() []*object.Endpoints {
},
},
},
Name: "testsvc",
Namespace: "testns",
},
}
return eps

8
plugin/kubernetes/local.go
View file

@ -28,11 +28,7 @@ func (k *Kubernetes) localNodeName() string {
}
// Find endpoint matching localIP
ep := k.APIConn.EpIndexReverse(localIP.String())
if ep == nil {
return ""
}
for _, ep := range k.APIConn.EpIndexReverse(localIP.String()) {
for _, eps := range ep.Subsets {
for _, addr := range eps.Addresses {
if localIP.Equal(net.ParseIP(addr.IP)) {
@ -40,6 +36,6 @@ func (k *Kubernetes) localNodeName() string {
}
}
}
}
return ""
}

13
plugin/kubernetes/ns.go
View file

@ -4,7 +4,6 @@ import (
"net"
"strings"
"github.com/coredns/coredns/plugin/kubernetes/object"
"github.com/miekg/dns"
api "k8s.io/api/core/v1"
)
@ -23,9 +22,8 @@ func (k *Kubernetes) nsAddr() *dns.A {
localIP := k.interfaceAddrsFunc()
rr.A = localIP
ep := k.APIConn.EpIndexReverse(localIP.String())
if ep != nil {
FindEndpoint:
FindEndpoint:
for _, ep := range k.APIConn.EpIndexReverse(localIP.String()) {
for _, eps := range ep.Subsets {
for _, addr := range eps.Addresses {
if localIP.Equal(net.ParseIP(addr.IP)) {
@ -43,13 +41,16 @@ func (k *Kubernetes) nsAddr() *dns.A {
return rr
}
svc := k.APIConn.SvcIndex(object.ServiceKey(svcNamespace, svcName))
if svc != nil {
FindService:
for _, svc := range k.APIConn.ServiceList() {
if svcName == svc.Name && svcNamespace == svc.Namespace {
if svc.ClusterIP == api.ClusterIPNone {
rr.A = localIP
} else {
rr.A = net.ParseIP(svc.ClusterIP)
}
break FindService
}
}
rr.Hdr.Name = strings.Join([]string{svcName, svcNamespace, "svc."}, ".")

22
plugin/kubernetes/ns_test.go
View file

@ -15,23 +15,15 @@ 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) SvcIndexReverse(string) *object.Service { return nil }
func (APIConnTest) EpIndex(string) *object.Endpoints { 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 (APIConnTest) SetWatchChan(watch.Chan) {}
func (APIConnTest) Watch(string) error { return nil }
func (APIConnTest) StopWatching(string) {}
func (a APIConnTest) SvcIndex(key string) *object.Service {
for _, s := range a.ServiceList() {
if object.ServiceKey(s.Namespace, s.Name) == key {
return s
}
}
return nil
}
func (APIConnTest) ServiceList() []*object.Service {
svcs := []*object.Service{
{
@ -43,8 +35,9 @@ func (APIConnTest) ServiceList() []*object.Service {
return svcs
}
func (APIConnTest) EpIndexReverse(string) *object.Endpoints {
eps := object.Endpoints{
func (APIConnTest) EpIndexReverse(string) []*object.Endpoints {
eps := []*object.Endpoints{
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -56,8 +49,9 @@ func (APIConnTest) EpIndexReverse(string) *object.Endpoints {
},
Name: "dns-service",
Namespace: "kube-system",
},
}
return &eps
return eps
}
func (APIConnTest) GetNodeByName(name string) (*api.Node, error) { return &api.Node{}, nil }

4
plugin/kubernetes/object/endpoint.go
View file

@ -40,7 +40,7 @@ type EndpointPort struct {
}
// EndpointsKey return a string using for the index.
func EndpointsKey(namespace, name string) string { return namespace + "/" + name }
func EndpointsKey(name, namespace string) string { return name + "." + namespace }
// ToEndpoints converts an api.Service to a *Service.
func ToEndpoints(obj interface{}) interface{} {
@ -61,7 +61,7 @@ func ToEndpoints(obj interface{}) interface{} {
Addresses: make([]EndpointAddress, len(eps.Addresses)),
}
if len(eps.Ports) == 0 {
// Add sentinel if there are no ports.
// Add sentinal if there are no ports.
sub.Ports = []EndpointPort{{Port: -1}}
} else {
sub.Ports = make([]EndpointPort, len(eps.Ports))

2
plugin/kubernetes/object/service.go
View file

@ -20,7 +20,7 @@ type Service struct {
}
// ServiceKey return a string using for the index.
func ServiceKey(namespace, name string) string { return namespace + "/" + name }
func ServiceKey(name, namespace string) string { return name + "." + namespace }
// ToService converts an api.Service to a *Service.
func ToService(obj interface{}) interface{} {

26
plugin/kubernetes/reverse.go
View file

@ -18,35 +18,35 @@ func (k *Kubernetes) Reverse(state request.Request, exact bool, opt plugin.Optio
return nil, e
}
record := k.serviceRecordForIP(ip, state.Name())
if record == nil {
return nil, errNoItems
records := k.serviceRecordForIP(ip, state.Name())
if len(records) == 0 {
return records, errNoItems
}
return []msg.Service{*record}, nil
return records, nil
}
// serviceRecordForIP gets a service record with a cluster ip matching the ip argument
// If a service cluster ip does not match, it checks all endpoints
func (k *Kubernetes) serviceRecordForIP(ip, name string) *msg.Service {
func (k *Kubernetes) serviceRecordForIP(ip, name string) []msg.Service {
// First check services with cluster ips
service := k.APIConn.SvcIndexReverse(ip)
if service != nil {
for _, service := range k.APIConn.SvcIndexReverse(ip) {
if len(k.Namespaces) > 0 && !k.namespaceExposed(service.Namespace) {
return nil
continue
}
domain := strings.Join([]string{service.Name, service.Namespace, Svc, k.primaryZone()}, ".")
return &msg.Service{Host: domain, TTL: k.ttl}
return []msg.Service{{Host: domain, TTL: k.ttl}}
}
// If no cluster ips match, search endpoints
ep := k.APIConn.EpIndexReverse(ip)
if ep == nil || len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) {
return nil
for _, ep := range k.APIConn.EpIndexReverse(ip) {
if len(k.Namespaces) > 0 && !k.namespaceExposed(ep.Namespace) {
continue
}
for _, eps := range ep.Subsets {
for _, addr := range eps.Addresses {
if addr.IP == ip {
domain := strings.Join([]string{endpointHostname(addr, k.endpointNameMode), ep.Name, ep.Namespace, Svc, k.primaryZone()}, ".")
return &msg.Service{Host: domain, TTL: k.ttl}
return []msg.Service{{Host: domain, TTL: k.ttl}}
}
}
}
}

28
plugin/kubernetes/reverse_test.go
View file

@ -20,7 +20,7 @@ func (APIConnReverseTest) HasSynced() bool { return true }
func (APIConnReverseTest) Run() { return }
func (APIConnReverseTest) Stop() error { return nil }
func (APIConnReverseTest) PodIndex(string) []*object.Pod { return nil }
func (APIConnReverseTest) EpIndex(string) *object.Endpoints { return nil }
func (APIConnReverseTest) EpIndex(string) []*object.Endpoints { return nil }
func (APIConnReverseTest) EndpointsList() []*object.Endpoints { return nil }
func (APIConnReverseTest) ServiceList() []*object.Service { return nil }
func (APIConnReverseTest) Modified() int64 { return 0 }
@ -28,34 +28,38 @@ func (APIConnReverseTest) SetWatchChan(watch.Chan) {}
func (APIConnReverseTest) Watch(string) error { return nil }
func (APIConnReverseTest) StopWatching(string) {}
func (APIConnReverseTest) SvcIndex(key string) *object.Service {
if key != "testns/svc1" {
func (APIConnReverseTest) SvcIndex(svc string) []*object.Service {
if svc != "svc1.testns" {
return nil
}
svc := object.Service{
svcs := []*object.Service{
{
Name: "svc1",
Namespace: "testns",
ClusterIP: "192.168.1.100",
Ports: []api.ServicePort{{Name: "http", Protocol: "tcp", Port: 80}},
},
}
return &svc
return svcs
}
func (APIConnReverseTest) SvcIndexReverse(ip string) *object.Service {
func (APIConnReverseTest) SvcIndexReverse(ip string) []*object.Service {
if ip != "192.168.1.100" {
return nil
}
svc := object.Service{
svcs := []*object.Service{
{
Name: "svc1",
Namespace: "testns",
ClusterIP: "192.168.1.100",
Ports: []api.ServicePort{{Name: "http", Protocol: "tcp", Port: 80}},
},
}
return &svc
return svcs
}
func (APIConnReverseTest) EpIndexReverse(ip string) *object.Endpoints {
func (APIConnReverseTest) EpIndexReverse(ip string) []*object.Endpoints {
switch ip {
case "10.0.0.100":
case "1234:abcd::1":
@ -64,7 +68,8 @@ func (APIConnReverseTest) EpIndexReverse(ip string) *object.Endpoints {
default:
return nil
}
ep := object.Endpoints{
eps := []*object.Endpoints{
{
Subsets: []object.EndpointSubset{
{
Addresses: []object.EndpointAddress{
@ -80,8 +85,9 @@ func (APIConnReverseTest) EpIndexReverse(ip string) *object.Endpoints {
},
Name: "svc1",
Namespace: "testns",
},
}
return &ep
return eps
}
func (APIConnReverseTest) GetNodeByName(name string) (*api.Node, error) {

12
plugin/kubernetes/xfr.go
View file

@ -9,7 +9,6 @@ import (
"github.com/coredns/coredns/plugin"
"github.com/coredns/coredns/plugin/etcd/msg"
"github.com/coredns/coredns/request"
"k8s.io/client-go/tools/cache"
"github.com/miekg/dns"
api "k8s.io/api/core/v1"
@ -115,11 +114,13 @@ func (k *Kubernetes) transfer(c chan dns.RR, zone string) {
continue
}
key, err := cache.MetaNamespaceKeyFunc(svc)
if err != nil {
return
endpointsList := k.APIConn.EpIndex(svc.Name + "." + svc.Namespace)
for _, ep := range endpointsList {
if ep.Name != svc.Name || ep.Namespace != svc.Namespace {
continue
}
ep := k.APIConn.EpIndex(key)
for _, eps := range ep.Subsets {
srvWeight := calcSRVWeight(len(eps.Addresses))
for _, addr := range eps.Addresses {
@ -148,6 +149,7 @@ func (k *Kubernetes) transfer(c chan dns.RR, zone string) {
}
}
}
}
case api.ServiceTypeExternalName: