From 19e7b4a0c1996891c53dc4a5486247f2a810aa06 Mon Sep 17 00:00:00 2001 From: "Nicolai \"niggl\" Ort" Date: Wed, 4 Feb 2026 12:46:07 +0100 Subject: [PATCH 1/3] fix(loadbalancer): Added SG delete to ealry return if lb does not exist --- pkg/openstack/loadbalancer.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go index c67ba1f1b4..a4e435699e 100644 --- a/pkg/openstack/loadbalancer.go +++ b/pkg/openstack/loadbalancer.go @@ -2106,6 +2106,12 @@ func (lbaas *LbaasV2) ensureLoadBalancerDeleted(ctx context.Context, clusterName return err } if loadbalancer == nil { + klog.V(4).Info("Hit early return") + // Delete the Security Group. We're doing that even if `manage-security-groups` is disabled to make sure we don't + // orphan created SGs even if CPO got reconfigured. + if err := lbaas.ensureSecurityGroupDeleted(ctx, service); err != nil { + return err + } return nil } From b2b93789727a4c70b4167ef5438275187b73f3eb Mon Sep 17 00:00:00 2001 From: "Nicolai \"niggl\" Ort" Date: Wed, 4 Feb 2026 13:26:20 +0100 Subject: [PATCH 2/3] chore(loadbalancers): Remove log for early return --- pkg/openstack/loadbalancer.go | 6 ------ 1 file changed, 6 deletions(-) diff --git a/pkg/openstack/loadbalancer.go b/pkg/openstack/loadbalancer.go index a4e435699e..c67ba1f1b4 100644 --- a/pkg/openstack/loadbalancer.go +++ b/pkg/openstack/loadbalancer.go @@ -2106,12 +2106,6 @@ func (lbaas *LbaasV2) ensureLoadBalancerDeleted(ctx context.Context, clusterName return err } if loadbalancer == nil { - klog.V(4).Info("Hit early return") - // Delete the Security Group. We're doing that even if `manage-security-groups` is disabled to make sure we don't - // orphan created SGs even if CPO got reconfigured. - if err := lbaas.ensureSecurityGroupDeleted(ctx, service); err != nil { - return err - } return nil } From 76ec1c26a329c446de61d5c664b04146def18bd6 Mon Sep 17 00:00:00 2001 From: "Nicolai \"niggl\" Ort" Date: Wed, 4 Feb 2026 13:31:51 +0100 Subject: [PATCH 3/3] fix(loadbalancer): Increase delete timeout by tweaking steps --- pkg/util/openstack/loadbalancer.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/util/openstack/loadbalancer.go b/pkg/util/openstack/loadbalancer.go index a9225fff44..6d9288a1a9 100644 --- a/pkg/util/openstack/loadbalancer.go +++ b/pkg/util/openstack/loadbalancer.go @@ -50,7 +50,7 @@ const ( waitLoadbalancerInitDelay = 1 * time.Second waitLoadbalancerFactor = 1.2 waitLoadbalancerActiveSteps = 23 - waitLoadbalancerDeleteSteps = 12 + waitLoadbalancerDeleteSteps = 24 activeStatus = "ACTIVE" errorStatus = "ERROR"