Add anyMatch for NodeAddress match

kzaitsev · kzaitsev · commit 612c52fdf738 · 2023-07-26T16:17:53.000+03:00
diff --git a/serverscom/instances.go b/serverscom/instances.go
@@ -29,7 +29,7 @@ func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName)
 	}
 
 	for _, instance := range cloudInstances {
-		if instance.Name == string(nodeName) {
+		if instance.Name == string(nodeName) || anyMatch(string(nodeName), instance.PrivateIPv4Address, instance.PublicIPv4Address) {
 			return collectCloudInstanceAddresses(&instance), nil
 		}
 	}
@@ -44,7 +44,7 @@ func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName)
 	}
 
 	for _, host := range hosts {
-		if host.Title == string(nodeName) {
+		if host.Title == string(nodeName) || anyMatch(string(nodeName), host.PrivateIPv4Address, host.PublicIPv4Address) {
 			return collectHostAddresses(&host), nil
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName)`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`for _, instance := range cloudInstances {`
`32`		`- if instance.Name == string(nodeName) {`
	`32`	`+ if instance.Name == string(nodeName) \|\| anyMatch(string(nodeName), instance.PrivateIPv4Address, instance.PublicIPv4Address) {`
`33`	`33`	`return collectCloudInstanceAddresses(&instance), nil`
`34`	`34`	`}`
`35`	`35`	`}`
`@@ -44,7 +44,7 @@ func (i *instances) NodeAddresses(ctx context.Context, nodeName types.NodeName)`
`44`	`44`	`}`
`45`	`45`
`46`	`46`	`for _, host := range hosts {`
`47`		`- if host.Title == string(nodeName) {`
	`47`	`+ if host.Title == string(nodeName) \|\| anyMatch(string(nodeName), host.PrivateIPv4Address, host.PublicIPv4Address) {`
`48`	`48`	`return collectHostAddresses(&host), nil`
`49`	`49`	`}`
`50`	`50`	`}`