Skip to content

Commit b8d09b2

Browse files
Merge pull request #149 from dulek/allow-delete-error-openshift
Bug OCPBUGS-3827: Allow deleting LBs in ERROR status
2 parents 3e2deac + 4456ce9 commit b8d09b2

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

pkg/openstack/loadbalancer.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ const (
6464
defaultLoadBalancerSourceRangesIPv4 = "0.0.0.0/0"
6565
defaultLoadBalancerSourceRangesIPv6 = "::/0"
6666
activeStatus = "ACTIVE"
67+
errorStatus = "ERROR"
6768
annotationXForwardedFor = "X-Forwarded-For"
6869

6970
ServiceAnnotationLoadBalancerInternal = "service.beta.kubernetes.io/openstack-internal-load-balancer"
@@ -3462,8 +3463,8 @@ func (lbaas *LbaasV2) ensureLoadBalancerDeleted(ctx context.Context, clusterName
34623463
return nil
34633464
}
34643465

3465-
if loadbalancer.ProvisioningStatus != activeStatus {
3466-
return fmt.Errorf("load balancer %s is not ACTIVE, current provisioning status: %s", loadbalancer.ID, loadbalancer.ProvisioningStatus)
3466+
if loadbalancer.ProvisioningStatus != activeStatus && loadbalancer.ProvisioningStatus != errorStatus {
3467+
return fmt.Errorf("load balancer %s is in immutable status, current provisioning status: %s", loadbalancer.ID, loadbalancer.ProvisioningStatus)
34673468
}
34683469

34693470
if strings.HasPrefix(loadbalancer.Name, servicePrefix) {

0 commit comments

Comments
 (0)