Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 13 additions & 1 deletion pkg/cloud/openstack/machine/actuator.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
constants "sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/contants"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/compute"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/loadbalancer"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/networking"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/provider"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/cloud/openstack/services/userdata"
"sigs.k8s.io/cluster-api-provider-openstack/pkg/deployer"
Expand Down Expand Up @@ -96,6 +97,11 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
return err
}

networkingService, err := networking.NewService(osProviderClient, clientOpts)
if err != nil {
return err
}

clusterProviderSpec, clusterProviderStatus, err := providerv1.ClusterSpecAndStatusFromProviderSpec(cluster)
if err != nil {
return a.handleMachineError(machine, apierrors.CreateMachine(
Expand Down Expand Up @@ -149,7 +155,13 @@ func (a *Actuator) Create(ctx context.Context, cluster *clusterv1.Cluster, machi
}

if machineProviderSpec.FloatingIP != "" {
err := computeService.AssociateFloatingIP(instance.ID, machineProviderSpec.FloatingIP)
err := networkingService.GetOrCreateFloatingIP(clusterProviderSpec, machineProviderSpec.FloatingIP)
if err != nil {
return a.handleMachineError(machine, apierrors.CreateMachine(
"Create floatingIP err: %v", err))
}

err = computeService.AssociateFloatingIP(instance.ID, machineProviderSpec.FloatingIP)
if err != nil {
return a.handleMachineError(machine, apierrors.CreateMachine(
"Associate floatingIP err: %v", err))
Expand Down
19 changes: 14 additions & 5 deletions pkg/cloud/openstack/services/loadbalancer/loadbalancer.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,16 +68,25 @@ func (s *Service) ReconcileLoadBalancer(clusterName string, clusterProviderSpec
fpCreateOpts := &floatingips.CreateOpts{
FloatingIP: clusterProviderSpec.APIServerLoadBalancerFloatingIP,
FloatingNetworkID: clusterProviderSpec.ExternalNetworkID,
PortID: lb.VipPortID,
}
fp, err = floatingips.Create(s.networkingClient, fpCreateOpts).Extract()
if err != nil {
return fmt.Errorf("error allocating floating IP: %s", err)
}
err = waitForFloatingIP(s.networkingClient, fp.ID, "ACTIVE")
if err != nil {
return err
}
}

// associate floating ip
klog.Infof("Associating floating ip %s", clusterProviderSpec.APIServerLoadBalancerFloatingIP)
fpUpdateOpts := &floatingips.UpdateOpts{
PortID: &lb.VipPortID,
}
fp, err = floatingips.Update(s.networkingClient, fp.ID, fpUpdateOpts).Extract()
if err != nil {
return fmt.Errorf("error allocating floating IP: %s", err)
}
err = waitForFloatingIP(s.networkingClient, fp.ID, "ACTIVE")
if err != nil {
return err
}

// lb listener
Expand Down
63 changes: 63 additions & 0 deletions pkg/cloud/openstack/services/networking/floatingip.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
package networking

import (
"fmt"
"github.com/gophercloud/gophercloud"
"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/klog"
providerv1 "sigs.k8s.io/cluster-api-provider-openstack/pkg/apis/openstackproviderconfig/v1alpha1"
"time"
)

func (s *Service) GetOrCreateFloatingIP(clusterProviderSpec *providerv1.OpenstackClusterProviderSpec, ip string) error {
fp, err := checkIfFloatingIPExists(s.client, ip)
if err != nil {
return err
}
if fp == nil {
klog.Infof("Creating floating ip %s", ip)
fpCreateOpts := &floatingips.CreateOpts{
FloatingIP: ip,
FloatingNetworkID: clusterProviderSpec.ExternalNetworkID,
}
fp, err = floatingips.Create(s.client, fpCreateOpts).Extract()
if err != nil {
return fmt.Errorf("error allocating floating IP: %s", err)
}
}
return nil
}

func checkIfFloatingIPExists(client *gophercloud.ServiceClient, ip string) (*floatingips.FloatingIP, error) {
allPages, err := floatingips.List(client, floatingips.ListOpts{FloatingIP: ip}).AllPages()
if err != nil {
return nil, err
}
fpList, err := floatingips.ExtractFloatingIPs(allPages)
if err != nil {
return nil, err
}
if len(fpList) == 0 {
return nil, nil
}
return &fpList[0], nil
}

var backoff = wait.Backoff{
Steps: 10,
Duration: 30 * time.Second,
Factor: 1.0,
Jitter: 0.1,
}

func waitForFloatingIP(client *gophercloud.ServiceClient, id, target string) error {
klog.Infof("Waiting for floatingip %s to become %s.", id, target)
return wait.ExponentialBackoff(backoff, func() (bool, error) {
fp, err := floatingips.Get(client, id).Extract()
if err != nil {
return false, err
}
return fp.Status == target, nil
})
}