github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-18 08:09:58 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #50931 from jrperritt/fix-pool-panic

Browse Source 
Automatic merge from submit-queue

cloudprovider/openstack bug fix: don't try to append pool id if pool doesn't exist

**What this PR does / why we need it**:

This fixes a bug in the OpenStack cloud provider that could cause a panic.

Consider what will happen in the current `LbaasV2.EnsureLoadBalancerDeleted` code if `nil, ErrNotFound` is returned by `getPoolByListenerID`.
This commit is contained in:
Kubernetes Submit Queue 2017-08-23 16:23:29 -07:00 committed by GitHub
commit 6bb928a3df
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1144,10 +1144,12 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
if err != nil && err != ErrNotFound { if err != nil && err != ErrNotFound {
return fmt.Errorf("Error getting pool for listener %s: %v", listener.ID, err) return fmt.Errorf("Error getting pool for listener %s: %v", listener.ID, err)
} }
poolIDs = append(poolIDs, pool.ID) if pool != nil {
// If create-monitor of cloud-config is false, pool has not monitor. poolIDs = append(poolIDs, pool.ID)
if pool.MonitorID != "" { // If create-monitor of cloud-config is false, pool has not monitor.
monitorIDs = append(monitorIDs, pool.MonitorID) if pool.MonitorID != "" {
monitorIDs = append(monitorIDs, pool.MonitorID)
}
} }
} }