Match instance by IPs

Author: kzaitsev

serverscom/instances.go

@@ -108,7 +108,7 @@ func (i *instances) InstanceID(ctx context.Context, nodeName types.NodeName) (st
 	}
 
 	for _, instance := range cloudInstances {
-		if instance.Name == string(nodeName) {
+		if instance.Name == string(nodeName) || anyMatch(string(nodeName), instance.PrivateIPv4Address, instance.PublicIPv4Address) {
 			return buildExternalID(cloudInstanceType, instance.ID), nil
 		}
 	}
@@ -123,7 +123,7 @@ func (i *instances) InstanceID(ctx context.Context, nodeName types.NodeName) (st
 	}
 
 	for _, host := range hosts {
-		if host.Title == string(nodeName) {
+		if host.Title == string(nodeName) || anyMatch(string(nodeName), host.PrivateIPv4Address, host.PublicIPv4Address) {
 			switch host.Type {
 			case "dedicated_server":
 				return buildExternalID(dedicatedServerType, host.ID), nil

serverscom/utils.go

@@ -120,3 +120,17 @@ func getLoadBalancerName(srv *v1.Service, clusterName string) string {
 	}
 	return fmt.Sprintf("service-%s-%s", clusterName, ret)
 }
+
+func anyMatch(str string, matches ...*string) bool {
+	for _, m := range matches {
+		if m == nil {
+			continue
+		}
+
+		if *m == str {
+			return true
+		}
+	}
+
+	return false
+}