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

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`.
godber · Aug 23, 2017 · 6bb928a · 6bb928a
2 parents 8a12b65 + 21ce3de
commit 6bb928a
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go b/pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go
@@ -1144,10 +1144,12 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
 		if err != nil && err != ErrNotFound {
 			return fmt.Errorf("Error getting pool for listener %s: %v", listener.ID, err)
 		}
-		poolIDs = append(poolIDs, pool.ID)
-		// If create-monitor of cloud-config is false, pool has not monitor.
-		if pool.MonitorID != "" {
-			monitorIDs = append(monitorIDs, pool.MonitorID)
+		if pool != nil {
+			poolIDs = append(poolIDs, pool.ID)
+			// If create-monitor of cloud-config is false, pool has not monitor.
+			if pool.MonitorID != "" {
+				monitorIDs = append(monitorIDs, pool.MonitorID)
+			}
 		}
 	}