Skip to content
This repository was archived by the owner on Mar 22, 2018. It is now read-only.

Commit 3ab8a7f

Browse files
author
Kubernetes Submit Queue
authored
Merge pull request #56675 from stewart-yu/removeUnnecessaryCondition
Automatic merge from submit-queue (batch tested with PRs 56480, 56675, 56624, 56648, 56658). 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>. remove unnecessary condition **What this PR does / why we need it**: Now that we have judgement `loadbalancer == nil` in `L1286`, the condition is uncessary. **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 # **Special notes for your reviewer**: **Release note**: ```release-note NONE ```
2 parents a7f02c6 + 8b4aa25 commit 3ab8a7f

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

pkg/cloudprovider/providers/openstack/openstack_loadbalancer.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1341,7 +1341,7 @@ func (lbaas *LbaasV2) EnsureLoadBalancerDeleted(clusterName string, service *v1.
13411341
return nil
13421342
}
13431343

1344-
if loadbalancer != nil && loadbalancer.VipPortID != "" {
1344+
if loadbalancer.VipPortID != "" {
13451345
portID := loadbalancer.VipPortID
13461346
floatingIP, err := getFloatingIPByPortID(lbaas.network, portID)
13471347
if err != nil && err != ErrNotFound {

0 commit comments

Comments
 (0)