occm: Fix LoadBalancer deletion when the underlying LoadBalancer does not exist (kubernetes#1913) (kubernetes#1917)

jichenjc · ialidzhikov · web-flow · commit a3fcece25426 · 2022-06-15T01:07:18.000-07:00
Co-authored-by: Ismail Alidzhikov &lt;i.alidjikov@gmail.com&gt;
diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go
@@ -674,7 +674,7 @@ func (lbaas *LbaasV2) GetLoadBalancer(ctx context.Context, clusterName string, s
 	} else {
 		loadbalancer, err = getLoadbalancerByName(lbaas.lb, name, legacyName)
 	}
-	if err == cpoerrors.ErrNotFound {
+	if err != nil && cpoerrors.IsNotFound(err) {
 		return nil, false, nil
 	}
 	if loadbalancer == nil {

Original file line number	Diff line number	Diff line change
`@@ -674,7 +674,7 @@ func (lbaas *LbaasV2) GetLoadBalancer(ctx context.Context, clusterName string, s`
`674`	`674`	`} else {`
`675`	`675`	`loadbalancer, err = getLoadbalancerByName(lbaas.lb, name, legacyName)`
`676`	`676`	`}`
`677`		`- if err == cpoerrors.ErrNotFound {`
	`677`	`+ if err != nil && cpoerrors.IsNotFound(err) {`
`678`	`678`	`return nil, false, nil`
`679`	`679`	`}`
`680`	`680`	`if loadbalancer == nil {`