Merge pull request #2639 from ovstuckrad/fix-get-subnet-id-for-lb

zetaab · web-flow · commit 4b76079d0f59 · 2024-09-05T15:30:44.000+03:00
[occm] Fix: Set instanceID to get subnet for loadbalancer.
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -496,7 +496,7 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref
 		return "", err
 	}
 
-	_, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)
+	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)
 	}

Original file line number	Diff line number	Diff line change
`@@ -496,7 +496,7 @@ func getSubnetIDForLB(network *gophercloud.ServiceClient, node corev1.Node, pref`
`496`	`496`	`return "", err`
`497`	`497`	`}`
`498`	`498`
`499`		`- _, instanceID, err := instanceIDFromProviderID(node.Spec.ProviderID)`
	`499`	`+ instanceID, _, err := instanceIDFromProviderID(node.Spec.ProviderID)`
`500`	`500`	`if err != nil {`
`501`	`501`	`return "", fmt.Errorf("can't determine instance ID from ProviderID when autodetecting LB subnet: %w", err)`
`502`	`502`	`}`