Skip to content

🐛 Persist API FloatingIP immediately on creation #1829

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 17, 2024
Merged

🐛 Persist API FloatingIP immediately on creation #1829

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 23 additions & 10 deletions pkg/cloud/services/loadbalancer/loadbalancer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,16 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
loadBalancerName := getLoadBalancerName(clusterName)
s.scope.Logger().Info("Reconciling load balancer", "name", loadBalancerName)

lbStatus := openStackCluster.Status.APIServerLoadBalancer
if lbStatus == nil {
lbStatus = &infrav1.LoadBalancer{}
openStackCluster.Status.APIServerLoadBalancer = lbStatus
}

var fixedIPAddress string
switch {
case lbStatus.InternalIP != "":
fixedIPAddress = lbStatus.InternalIP
case openStackCluster.Spec.APIServerFixedIP != "":
fixedIPAddress = openStackCluster.Spec.APIServerFixedIP
case openStackCluster.Spec.DisableAPIServerFloatingIP && openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
Expand Down Expand Up @@ -82,14 +90,21 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
if err != nil {
return false, err
}

lbStatus.Name = lb.Name
lbStatus.ID = lb.ID
lbStatus.InternalIP = lb.VipAddress
lbStatus.Tags = lb.Tags

if err := s.waitForLoadBalancerActive(lb.ID); err != nil {
return false, fmt.Errorf("load balancer %q with id %s is not active after timeout: %v", loadBalancerName, lb.ID, err)
}

var lbFloatingIP string
if !openStackCluster.Spec.DisableAPIServerFloatingIP {
var floatingIPAddress string
switch {
case lbStatus.IP != "":
floatingIPAddress = lbStatus.IP
case openStackCluster.Spec.APIServerFloatingIP != "":
floatingIPAddress = openStackCluster.Spec.APIServerFloatingIP
case openStackCluster.Spec.ControlPlaneEndpoint.IsValid():
Expand All @@ -99,10 +114,15 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
if err != nil {
return false, err
}

// Write the floating IP to the status immediately so we won't
// create a new floating IP on the next reconcile if something
// fails below.
lbStatus.IP = fp.FloatingIP

if err = s.networkingService.AssociateFloatingIP(openStackCluster, fp, lb.VipPortID); err != nil {
return false, err
}
lbFloatingIP = fp.FloatingIP
}

allowedCIDRs := []string{}
Expand Down Expand Up @@ -147,15 +167,8 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
}
}
}
lbStatus.AllowedCIDRs = allowedCIDRs

openStackCluster.Status.APIServerLoadBalancer = &infrav1.LoadBalancer{
Name: lb.Name,
ID: lb.ID,
InternalIP: lb.VipAddress,
IP: lbFloatingIP,
AllowedCIDRs: allowedCIDRs,
Tags: lb.Tags,
}
return false, nil
}

Expand Down