aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Chris O'Haver <cohaver@infoblox.com> 2017-06-02 02:25:33 -0400
committerGravatar Miek Gieben <miek@miek.nl> 2017-06-02 07:25:33 +0100
commitd684dedfd3e1fa41381ccf3c5b9bd559ee144542 (patch)
treec83068e9b16e4c369d3f96d827516d04d75043cc
parenta4eea611905498c307804fc4dbc89765febc4bc7 (diff)
downloadcoredns-d684dedfd3e1fa41381ccf3c5b9bd559ee144542.tar.gz
coredns-d684dedfd3e1fa41381ccf3c5b9bd559ee144542.tar.zst
coredns-d684dedfd3e1fa41381ccf3c5b9bd559ee144542.zip
unexpose InterfaceAddrser (#693)
-rw-r--r--middleware/kubernetes/kubernetes.go2
-rw-r--r--middleware/kubernetes/ns.go10
-rw-r--r--middleware/kubernetes/ns_test.go6
-rw-r--r--middleware/kubernetes/setup.go2
4 files changed, 10 insertions, 10 deletions
diff --git a/middleware/kubernetes/kubernetes.go b/middleware/kubernetes/kubernetes.go
index 5e93420e9..921014af6 100644
--- a/middleware/kubernetes/kubernetes.go
+++ b/middleware/kubernetes/kubernetes.go
@@ -44,7 +44,7 @@ type Kubernetes struct {
PodMode string
ReverseCidrs []net.IPNet
Fallthrough bool
- interfaceAddrs InterfaceAddrser
+ interfaceAddrs interfaceAddrser
}
const (
diff --git a/middleware/kubernetes/ns.go b/middleware/kubernetes/ns.go
index 7f7736abc..84e3e2700 100644
--- a/middleware/kubernetes/ns.go
+++ b/middleware/kubernetes/ns.go
@@ -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())
diff --git a/middleware/kubernetes/ns_test.go b/middleware/kubernetes/ns_test.go
index 193eb056a..369ccbfb0 100644
--- a/middleware/kubernetes/ns_test.go
+++ b/middleware/kubernetes/ns_test.go
@@ -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()
diff --git a/middleware/kubernetes/setup.go b/middleware/kubernetes/setup.go
index e143fe8a9..f3958a59f 100644
--- a/middleware/kubernetes/setup.go
+++ b/middleware/kubernetes/setup.go
@@ -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,
}