Merge pull request #59340 from feiskyer/fip

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>. Ensure public IP removed after service deleted **What this PR does / why we need it**: When creating many LoadBalancer services, some services may exceed Azure basic LB's FrontendIPConfiguations quota (default is 10). Public IPs are created for all services, but it is not removed after deleting the kubernetes services. This PR fixes the problem. **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #59255 **Special notes for your reviewer**: Should cherry-pick to v1.9. **Release note**: ```release-note Ensure Azure public IP removed after service deleted ```

Merge pull request #59340 from feiskyer/fip
87f77cd2 · Kubernetes Submit Queue · GitHub · 4bd22b54 · e2eaccb8 · 87f77cd2
Unverified Commit 87f77cd2 authored Feb 06, 2018 by Kubernetes Submit Queue Committed by GitHub Feb 06, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

azure_loadbalancer.go pkg/cloudprovider/providers/azure/azure_loadbalancer.go +4 -2

No files found.
--- a/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
+++ b/pkg/cloudprovider/providers/azure/azure_loadbalancer.go
@@ -383,10 +383,12 @@ func (az *Cloud) findServiceIPAddress(clusterName string, service *v1.Service, i
 		return "", err
 	}
 	if !existsLb {
-		return "", fmt.Errorf("Expected to find an IP address for service %s but did not", service.Name)
+		glog.V(2).Infof("Expected to find an IP address for service %s but did not. Assuming it has been removed", service.Name)
+		return "", nil
 	}
 	if len(lbStatus.Ingress) < 1 {
-		return "", fmt.Errorf("Expected to find an IP address for service %s but it had no ingresses", service.Name)
+		glog.V(2).Infof("Expected to find an IP address for service %s but it had no ingresses. Assuming it has been removed", service.Name)
+		return "", nil
 	}

 	return lbStatus.Ingress[0].IP, nil