From 298e0ca5a0cd35662e23cff06d120bb042bbc052 Mon Sep 17 00:00:00 2001 From: Martin Linkhorst Date: Tue, 7 Mar 2017 17:48:12 +0100 Subject: [PATCH] ref(source): avoid shadowing the endpoint package (#66) --- dnsprovider/google.go | 6 ++---- source/ingress.go | 15 ++++++++------- source/service.go | 10 ++++------ 3 files changed, 14 insertions(+), 17 deletions(-) diff --git a/dnsprovider/google.go b/dnsprovider/google.go index 5486bed4e..e33a30104 100644 --- a/dnsprovider/google.go +++ b/dnsprovider/google.go @@ -94,12 +94,10 @@ func (p *GoogleProvider) Records(zone string) ([]endpoint.Endpoint, error) { } for _, rr := range r.Rrdatas { - endpoint := endpoint.Endpoint{ + endpoints = append(endpoints, endpoint.Endpoint{ DNSName: r.Name, Target: rr, - } - - endpoints = append(endpoints, endpoint) + }) } } diff --git a/source/ingress.go b/source/ingress.go index 2618f1bc3..a479877ce 100644 --- a/source/ingress.go +++ b/source/ingress.go @@ -58,16 +58,17 @@ func endpointsFromIngress(ing *v1beta1.Ingress) []endpoint.Endpoint { continue } for _, lb := range ing.Status.LoadBalancer.Ingress { - endpoint := endpoint.Endpoint{ - DNSName: rule.Host, - } if lb.IP != "" { - endpoint.Target = lb.IP - endpoints = append(endpoints, endpoint) + endpoints = append(endpoints, endpoint.Endpoint{ + DNSName: rule.Host, + Target: lb.IP, + }) } if lb.Hostname != "" { - endpoint.Target = lb.Hostname - endpoints = append(endpoints, endpoint) + endpoints = append(endpoints, endpoint.Endpoint{ + DNSName: rule.Host, + Target: lb.Hostname, + }) } } } diff --git a/source/service.go b/source/service.go index 0c01d12f4..1afa53dd6 100644 --- a/source/service.go +++ b/source/service.go @@ -79,18 +79,16 @@ func endpointsFromService(svc *v1.Service) []endpoint.Endpoint { // Create a corresponding endpoint for each configured external entrypoint. for _, lb := range svc.Status.LoadBalancer.Ingress { if lb.IP != "" { - endpoint := endpoint.Endpoint{ + endpoints = append(endpoints, endpoint.Endpoint{ DNSName: hostname, Target: lb.IP, - } - endpoints = append(endpoints, endpoint) + }) } if lb.Hostname != "" { - endpoint := endpoint.Endpoint{ + endpoints = append(endpoints, endpoint.Endpoint{ DNSName: hostname, Target: lb.Hostname, - } - endpoints = append(endpoints, endpoint) + }) } }