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

unexpose items per lint (#701)

Browse source
This commit is contained in:
Chris O'Haver 2017-06-02 23:54:33 -04:00 • committed by John Belamaric
parent bdf71cf251
commit ecae087201
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
middleware/kubernetes/ns.go
View file

@ -10,7 +10,7 @@ import (
"k8s.io/client-go/1.5/pkg/api" "k8s.io/client-go/1.5/pkg/api"
) )
const DefaultNSName = "ns.dns." const defaultNSName = "ns.dns."
var corednsRecord dns.A var corednsRecord dns.A
@ -25,7 +25,7 @@ func (i interfaceAddrs) interfaceAddrs() ([]net.Addr, error) {
} }
func (k *Kubernetes) recordsForNS(r recordRequest, svcs *[]msg.Service) error { func (k *Kubernetes) recordsForNS(r recordRequest, svcs *[]msg.Service) error {
ns := k.CoreDNSRecord() ns := k.coreDNSRecord()
s := msg.Service{ s := msg.Service{
Host: ns.A.String(), Host: ns.A.String(),
Key: msg.Path(strings.Join([]string{ns.Hdr.Name, r.zone}, "."), "coredns")} Key: msg.Path(strings.Join([]string{ns.Hdr.Name, r.zone}, "."), "coredns")}
@ -37,19 +37,19 @@ func (k *Kubernetes) recordsForNS(r recordRequest, svcs *[]msg.Service) error {
// ns.dns.[zone] -> dns service ip. This A record is needed to legitimize // ns.dns.[zone] -> dns service ip. This A record is needed to legitimize
// the SOA response in middleware.NS(), which is hardcoded at ns.dns.[zone]. // the SOA response in middleware.NS(), which is hardcoded at ns.dns.[zone].
func (k *Kubernetes) defaultNSMsg(r recordRequest) msg.Service { func (k *Kubernetes) defaultNSMsg(r recordRequest) msg.Service {
ns := k.CoreDNSRecord() ns := k.coreDNSRecord()
s := msg.Service{ s := msg.Service{
Key: msg.Path(strings.Join([]string{DefaultNSName, r.zone}, "."), "coredns"), Key: msg.Path(strings.Join([]string{defaultNSName, r.zone}, "."), "coredns"),
Host: ns.A.String(), Host: ns.A.String(),
} }
return s return s
} }
func isDefaultNS(name string, r recordRequest) bool { func isDefaultNS(name string, r recordRequest) bool {
return strings.Index(name, DefaultNSName) == 0 && strings.Index(name, r.zone) == len(DefaultNSName) return strings.Index(name, defaultNSName) == 0 && strings.Index(name, r.zone) == len(defaultNSName)
} }
func (k *Kubernetes) CoreDNSRecord() dns.A { func (k *Kubernetes) coreDNSRecord() dns.A {
var localIP net.IP var localIP net.IP
var svcName string var svcName string
var svcNamespace string var svcNamespace string
@ -87,7 +87,7 @@ func (k *Kubernetes) CoreDNSRecord() dns.A {
} }
if len(svcName) == 0 { if len(svcName) == 0 {
corednsRecord.Hdr.Name = DefaultNSName corednsRecord.Hdr.Name = defaultNSName
corednsRecord.A = localIP corednsRecord.A = localIP
return corednsRecord return corednsRecord
} }

2
middleware/kubernetes/ns_test.go
View file

@ -119,7 +119,7 @@ func TestDoCoreDNSRecord(t *testing.T) {
k.interfaceAddrs = &interfaceAddrsTest{} k.interfaceAddrs = &interfaceAddrsTest{}
k.APIConn = &APIConnTest{} k.APIConn = &APIConnTest{}
cdr := k.CoreDNSRecord() cdr := k.coreDNSRecord()
expected := "10.0.0.111" expected := "10.0.0.111"