github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 10:43:56 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
```
This commit is contained in:
Kubernetes Submit Queue 2018-01-13 00:36:23 -08:00 committed by GitHub
commit 2b764d7b62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
View File

@ -537,7 +537,7 @@ func getSubnetIDForLB(compute *gophercloud.ServiceClient, node v1.Node) (string,
for _, intf := range interfaces { for _, intf := range interfaces {
for _, fixedIP := range intf.FixedIPs { for _, fixedIP := range intf.FixedIPs {
if fixedIP.IPAddress == ipAddress { if fixedIP.IPAddress == ipAddress {
return intf.NetID, nil return fixedIP.SubnetID, nil
} }
} }
} }