Merge pull request #925 from Daimler/floating-ip-desc

✨ add description and tag to floating ips

Author: k8s-ci-robot

controllers/openstackcluster_controller.go

@@ -314,7 +314,8 @@ func reconcileBastion(log logr.Logger, osProviderClient *gophercloud.ProviderCli
 	if err != nil {
 		return err
 	}
-	fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster.Spec.Bastion.Instance.FloatingIP)
+	clusterName := fmt.Sprintf("%s-%s", cluster.Namespace, cluster.Name)
+	fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, clusterName, openStackCluster.Spec.Bastion.Instance.FloatingIP)
 	if err != nil {
 		return errors.Errorf("failed to get or create floating IP for bastion: %v", err)
 	}
@@ -403,7 +404,7 @@ func reconcileNetworkComponents(log logr.Logger, osProviderClient *gophercloud.P
 		} else {
 			port = int32(openStackCluster.Spec.APIServerPort)
 		}
-		fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster.Spec.APIServerFloatingIP)
+		fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, clusterName, openStackCluster.Spec.APIServerFloatingIP)
 		if err != nil {
 			return errors.Errorf("Floating IP cannot be got or created: %v", err)
 		}

controllers/openstackmachine_controller.go

@@ -348,7 +348,7 @@ func (r *OpenStackMachineReconciler) reconcileNormal(ctx context.Context, logger
 			return ctrl.Result{}, nil
 		}
 	} else if util.IsControlPlaneMachine(machine) {
-		fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, openStackCluster.Spec.ControlPlaneEndpoint.Host)
+		fp, err := networkingService.GetOrCreateFloatingIP(openStackCluster, clusterName, openStackCluster.Spec.ControlPlaneEndpoint.Host)
 		if err != nil {
 			handleUpdateMachineError(logger, openStackMachine, errors.Errorf("Floating IP cannot be got or created: %v", err))
 			return ctrl.Result{}, nil

pkg/cloud/services/loadbalancer/loadbalancer.go

@@ -53,7 +53,7 @@ func (s *Service) ReconcileLoadBalancer(openStackCluster *infrav1.OpenStackClust
 	if openStackCluster.Spec.APIServerFloatingIP != "" {
 		floatingIPAddress = openStackCluster.Spec.APIServerFloatingIP
 	}
-	fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, floatingIPAddress)
+	fp, err := s.networkingService.GetOrCreateFloatingIP(openStackCluster, clusterName, floatingIPAddress)
 	if err != nil {
 		return err
 	}

pkg/cloud/services/networking/floatingip.go

@@ -19,15 +19,17 @@ package networking
 import (
 	"time"
 
+	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/attributestags"
 	"github.com/gophercloud/gophercloud/openstack/networking/v2/extensions/layer3/floatingips"
 	"k8s.io/apimachinery/pkg/util/wait"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-openstack/api/v1alpha4"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/metrics"
 	"sigs.k8s.io/cluster-api-provider-openstack/pkg/record"
+	"sigs.k8s.io/cluster-api-provider-openstack/pkg/utils/names"
 )
 
-func (s *Service) GetOrCreateFloatingIP(openStackCluster *infrav1.OpenStackCluster, ip string) (*floatingips.FloatingIP, error) {
+func (s *Service) GetOrCreateFloatingIP(openStackCluster *infrav1.OpenStackCluster, clusterName, ip string) (*floatingips.FloatingIP, error) {
 	var fp *floatingips.FloatingIP
 	var err error
 	var fpCreateOpts floatingips.CreateOpts
@@ -45,6 +47,7 @@ func (s *Service) GetOrCreateFloatingIP(openStackCluster *infrav1.OpenStackClust
 	}
 
 	fpCreateOpts.FloatingNetworkID = openStackCluster.Status.ExternalNetwork.ID
+	fpCreateOpts.Description = names.GetDescription(clusterName)
 
 	mc := metrics.NewMetricPrometheusContext("floating_ip", "create")
 	fp, err = floatingips.Create(s.client, fpCreateOpts).Extract()
@@ -53,6 +56,16 @@ func (s *Service) GetOrCreateFloatingIP(openStackCluster *infrav1.OpenStackClust
 		return nil, err
 	}
 
+	if len(openStackCluster.Spec.Tags) > 0 {
+		mc := metrics.NewMetricPrometheusContext("floating_ip", "update")
+		_, err = attributestags.ReplaceAll(s.client, "floatingips", fp.ID, attributestags.ReplaceAllOpts{
+			Tags: openStackCluster.Spec.Tags,
+		}).Extract()
+		if mc.ObserveRequest(err) != nil {
+			return nil, err
+		}
+	}
+
 	record.Eventf(openStackCluster, "SuccessfulCreateFloatingIP", "Created floating IP %s with id %s", fp.FloatingIP, fp.ID)
 	return fp, nil
 }