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

unexpose InterfaceAddrser (#693)

Browse source
This commit is contained in:
Chris O'Haver 2017-06-02 02:25:33 -04:00 • committed by Miek Gieben
parent a4eea61190
commit d684dedfd3
4 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
middleware/kubernetes/kubernetes.go
View file

@ -44,7 +44,7 @@ type Kubernetes struct {
PodMode string PodMode string
ReverseCidrs []net.IPNet ReverseCidrs []net.IPNet
Fallthrough bool Fallthrough bool
interfaceAddrs InterfaceAddrser interfaceAddrs interfaceAddrser
} }
const ( const (

10
middleware/kubernetes/ns.go
View file

@ -14,13 +14,13 @@ const DefaultNSName = "ns.dns."
var corednsRecord dns.A var corednsRecord dns.A
type InterfaceAddrser interface { type interfaceAddrser interface {
InterfaceAddrs() ([]net.Addr, error) interfaceAddrs() ([]net.Addr, error)
} }
type InterfaceAddrs struct{} type interfaceAddrs struct{}
func (i InterfaceAddrs) InterfaceAddrs() ([]net.Addr, error) { func (i interfaceAddrs) interfaceAddrs() ([]net.Addr, error) {
return net.InterfaceAddrs() return net.InterfaceAddrs()
} }
@ -57,7 +57,7 @@ func (k *Kubernetes) CoreDNSRecord() dns.A {
if len(corednsRecord.Hdr.Name) == 0 || corednsRecord.A == nil { if len(corednsRecord.Hdr.Name) == 0 || corednsRecord.A == nil {
// get local Pod IP // get local Pod IP
addrs, _ := k.interfaceAddrs.InterfaceAddrs() addrs, _ := k.interfaceAddrs.interfaceAddrs()
for _, addr := range addrs { for _, addr := range addrs {
ip, _, _ := net.ParseCIDR(addr.String()) ip, _, _ := net.ParseCIDR(addr.String())

6
middleware/kubernetes/ns_test.go
View file

@ -104,9 +104,9 @@ func (APIConnTest) EndpointsList() api.EndpointsList {
} }
} }
type InterfaceAddrsTest struct{} type interfaceAddrsTest struct{}
func (i InterfaceAddrsTest) InterfaceAddrs() ([]net.Addr, error) { func (i interfaceAddrsTest) interfaceAddrs() ([]net.Addr, error) {
_, ipnet, _ := net.ParseCIDR("172.0.40.10/32") _, ipnet, _ := net.ParseCIDR("172.0.40.10/32")
return []net.Addr{ipnet}, nil return []net.Addr{ipnet}, nil
} }
@ -116,7 +116,7 @@ func TestDoCoreDNSRecord(t *testing.T) {
corednsRecord = dns.A{} corednsRecord = dns.A{}
k := Kubernetes{Zones: []string{"inter.webs.test"}} k := Kubernetes{Zones: []string{"inter.webs.test"}}
k.interfaceAddrs = &InterfaceAddrsTest{} k.interfaceAddrs = &interfaceAddrsTest{}
k.APIConn = &APIConnTest{} k.APIConn = &APIConnTest{}
cdr := k.CoreDNSRecord() cdr := k.CoreDNSRecord()

2
middleware/kubernetes/setup.go
View file

@ -55,7 +55,7 @@ func setup(c *caddy.Controller) error {
func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) { func kubernetesParse(c *caddy.Controller) (*Kubernetes, error) {
k8s := &Kubernetes{ k8s := &Kubernetes{
ResyncPeriod: defaultResyncPeriod, ResyncPeriod: defaultResyncPeriod,
interfaceAddrs: &InterfaceAddrs{}, interfaceAddrs: &interfaceAddrs{},
PodMode: PodModeDisabled, PodMode: PodModeDisabled,
} }