Merge pull request kubernetes#82264 from syseleven/openstack_dont_delete_lb_on_errors

k8s-ci-robot · ohsewon · commit 82c7203a0a46 · 2019-10-16T12:45:16.000+09:00
openstack: Don't Delete LB in Case of Security Group Reconciliation Errors
diff --git a/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_loadbalancer.go b/staging/src/k8s.io/legacy-cloud-providers/openstack/openstack_loadbalancer.go
@@ -999,9 +999,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string
 	if lbaas.opts.ManageSecurityGroups {
 		err := lbaas.ensureSecurityGroup(clusterName, apiService, nodes, loadbalancer)
 		if err != nil {
-			// cleanup what was created so far
-			_ = lbaas.EnsureLoadBalancerDeleted(ctx, clusterName, apiService)
-			return status, err
+			return status, fmt.Errorf("Error reconciling security groups for LB service %v/%v: %v", apiService.Namespace, apiService.Name, err)
 		}
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -999,9 +999,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancer(ctx context.Context, clusterName string`
`999`	`999`	`if lbaas.opts.ManageSecurityGroups {`
`1000`	`1000`	`err := lbaas.ensureSecurityGroup(clusterName, apiService, nodes, loadbalancer)`
`1001`	`1001`	`if err != nil {`
`1002`		`- // cleanup what was created so far`
`1003`		`- _ = lbaas.EnsureLoadBalancerDeleted(ctx, clusterName, apiService)`
`1004`		`- return status, err`
	`1002`	`+ return status, fmt.Errorf("Error reconciling security groups for LB service %v/%v: %v", apiService.Namespace, apiService.Name, err)`
`1005`	`1003`	`}`
`1006`	`1004`	`}`
`1007`	`1005`