Skip to content

Commit 828a1f4

Browse files
authored
Merge pull request #669 from hidekazuna/fix_ha_delete
🐛 Fix to delete only automatically created floating IPs
2 parents bebfc0c + 543e339 commit 828a1f4

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

controllers/openstackmachine_controller.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ func (r *OpenStackMachineReconciler) reconcileDelete(ctx context.Context, logger
241241
logger.Info("OpenStack machine deleted successfully")
242242
r.Recorder.Eventf(openStackMachine, corev1.EventTypeNormal, "SuccessfulDeleteServer", "Deleted server %s with id %s", instance.Name, instance.ID)
243243

244-
if util.IsControlPlaneMachine(machine) && openStackCluster.Spec.APIServerFloatingIP == "" {
244+
if !openStackCluster.Spec.ManagedAPIServerLoadBalancer && util.IsControlPlaneMachine(machine) && openStackCluster.Spec.APIServerFloatingIP == "" && instance.FloatingIP != "" {
245245
if err = networkingService.DeleteFloatingIP(instance.FloatingIP); err != nil {
246246
handleUpdateMachineError(logger, openStackMachine, errors.Errorf("error deleting Openstack floating IP: %v", err))
247247
return ctrl.Result{}, nil

0 commit comments

Comments
 (0)