Merge pull request #58208 from FengyunPan/fix-autoprobe-subnet

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. The lbaas.opts.SubnetId should be set by subnet id. Fix #58145 The getSubnetIDForLB() should return subnet id rather than net id. **Release note**: ```release-note NONE ```

Merge pull request #58208 from FengyunPan/fix-autoprobe-subnet
2b764d7b · Kubernetes Submit Queue · GitHub · 50e04f59 · 9958389e · 2b764d7b
Unverified Commit 2b764d7b authored Jan 13, 2018 by Kubernetes Submit Queue Committed by GitHub Jan 13, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

openstack_loadbalancer.go ...oudprovider/providers/openstack/openstack_loadbalancer.go +1 -1

No files found.
--- a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
+++ b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -537,7 +537,7 @@ func getSubnetIDForLB(compute *gophercloud.ServiceClient, node v1.Node) (string,
 	for _, intf := range interfaces {
 		for _, fixedIP := range intf.FixedIPs {
 			if fixedIP.IPAddress == ipAddress {
-				return intf.NetID, nil
+				return fixedIP.SubnetID, nil
 			}
 		}
 	}