unexpose InterfaceAddrser (#693)

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

View file

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

View file

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

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")
return []net.Addr{ipnet}, nil
}
@ -116,7 +116,7 @@ func TestDoCoreDNSRecord(t *testing.T) {
corednsRecord = dns.A{}
k := Kubernetes{Zones: []string{"inter.webs.test"}}
k.interfaceAddrs = &InterfaceAddrsTest{}
k.interfaceAddrs = &interfaceAddrsTest{}
k.APIConn = &APIConnTest{}
cdr := k.CoreDNSRecord()

View file

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