loadbalancers: Support nodes where nodeName is the private or public IP

do/common.go

@@ -19,6 +19,8 @@ package do
 import (
 	"fmt"
 
+	"k8s.io/api/core/v1"
+
 	"github.com/digitalocean/godo"
 	"github.com/digitalocean/godo/context"
 )
@@ -56,3 +58,23 @@ func allDropletList(ctx context.Context, client *godo.Client) ([]godo.Droplet, e
 
 	return list, nil
 }
+
+// nodeAddresses returns a []v1.NodeAddress from droplet.
+func nodeAddresses(droplet *godo.Droplet) ([]v1.NodeAddress, error) {
+	var addresses []v1.NodeAddress
+	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: droplet.Name})
+
+	privateIP, err := droplet.PrivateIPv4()
+	if err != nil || privateIP == "" {
+		return nil, fmt.Errorf("could not get private ip: %v", err)
+	}
+	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: privateIP})
+
+	publicIP, err := droplet.PublicIPv4()
+	if err != nil || publicIP == "" {
+		return nil, fmt.Errorf("could not get public ip: %v", err)
+	}
+	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: publicIP})
+
+	return addresses, nil
+}

do/droplets.go

@@ -71,26 +71,6 @@ func (i *instances) NodeAddressesByProviderID(providerID string) ([]v1.NodeAddre
 	return nodeAddresses(droplet)
 }
 
-// nodeAddresses returns a []v1.NodeAddress from droplet.
-func nodeAddresses(droplet *godo.Droplet) ([]v1.NodeAddress, error) {
-	var addresses []v1.NodeAddress
-	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeHostName, Address: droplet.Name})
-
-	privateIP, err := droplet.PrivateIPv4()
-	if err != nil || privateIP == "" {
-		return nil, fmt.Errorf("could not get private ip: %v", err)
-	}
-	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeInternalIP, Address: privateIP})
-
-	publicIP, err := droplet.PublicIPv4()
-	if err != nil || publicIP == "" {
-		return nil, fmt.Errorf("could not get public ip: %v", err)
-	}
-	addresses = append(addresses, v1.NodeAddress{Type: v1.NodeExternalIP, Address: publicIP})
-
-	return addresses, nil
-}
-
 // ExternalID returns the cloud provider ID of the droplet identified by
 // nodeName. If the droplet does not exist or is no longer running, the
 // returned error will be cloudprovider.InstanceNotFound.

do/loadbalancers.go

@@ -29,6 +29,7 @@ import (
 
 	"github.com/digitalocean/godo"
 	"github.com/digitalocean/godo/context"
+	"github.com/golang/glog"
 )
 
 const (
@@ -255,11 +256,23 @@ func (l *loadbalancers) nodesToDropletIDs(nodes []*v1.Node) ([]int, error) {
 
 	var dropletIDs []int
 	for _, node := range nodes {
+	Loop:
 		for _, droplet := range droplets {
 			if node.Name == droplet.Name {
 				dropletIDs = append(dropletIDs, droplet.ID)
 				break
 			}
+			addresses, err := nodeAddresses(&droplet)
+			if err != nil {
+				glog.Errorf("error getting node addresses for %s: %v", droplet.Name, err)
+				continue
+			}
+			for _, address := range addresses {
+				if address.Address == string(node.Name) {
+					dropletIDs = append(dropletIDs, droplet.ID)
+					break Loop
+				}
+			}
 		}
 	}