Use instanceIDFromProviderID() function (kubernetes#2302)

dulek · mandre · commit 8b2ed3b0d01a · 2024-02-07T09:03:36.000+01:00
This commit makes sure that in all instances of reading Nova instance ID
from the `.Spec.ProviderID` field, we're using
`instanceIDFromProviderID()` function which is designed for that
purpose.
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -695,9 +695,9 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref
 		return "", err
 	}
 
-	instanceID := node.Spec.ProviderID
-	if ind := strings.LastIndex(instanceID, "/"); ind >= 0 {
-		instanceID = instanceID[(ind + 1):]
+	_, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)
+	if err != nil {
+		return "", fmt.Errorf("can't determine instance ID from ProviderID when autodetecting LB subnet: %w", err)
 	}
 
 	ports, err := getAttachedPorts(network, instanceID)

Original file line number	Diff line number	Diff line change
`@@ -695,9 +695,9 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref`
`695`	`695`	`return "", err`
`696`	`696`	`}`
`697`	`697`
`698`		`- instanceID := node.Spec.ProviderID`
`699`		`- if ind := strings.LastIndex(instanceID, "/"); ind >= 0 {`
`700`		`- instanceID = instanceID[(ind + 1):]`
	`698`	`+ _, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)`
	`699`	`+ if err != nil {`
	`700`	`+ return "", fmt.Errorf("can't determine instance ID from ProviderID when autodetecting LB subnet: %w", err)`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`ports, err := getAttachedPorts(network, instanceID)`