IP address tagging and clean up is working

Author: mrog

pkg/cloud/network.go

@@ -90,12 +90,19 @@ func (c *client) GetOrCreateNetwork(csCluster *infrav1.CloudStackCluster) (retEr
 }
 
 func (c *client) DisassociatePublicIPAddressIfNotInUse(csCluster *infrav1.CloudStackCluster) (retError error) {
-	okayToDelete, err := c.DoClusterTagsAllowDisposal(ResourceTypeIPAddress, csCluster.Status.PublicIPID)
+	tagsAllowDisposal, err := c.DoClusterTagsAllowDisposal(ResourceTypeIPAddress, csCluster.Status.PublicIPID)
 	if err != nil {
 		return err
 	}
 
-	if okayToDelete {
+	// Can't disassociate an address if it's the source NAT address.
+	publicIP, _, err := c.cs.Address.GetPublicIpAddressByID(csCluster.Status.PublicIPID)
+	if err != nil {
+		return err
+	}
+	sourceNAT := publicIP != nil && publicIP.Issourcenat
+
+	if tagsAllowDisposal && !sourceNAT {
 		return c.DisassociatePublicIPAddress(csCluster)
 	}
 
@@ -152,11 +159,11 @@ func (c *client) AssociatePublicIPAddress(csCluster *infrav1.CloudStackCluster)
 
 	csCluster.Spec.ControlPlaneEndpoint.Host = publicAddress.Ipaddress
 	csCluster.Status.PublicIPID = publicAddress.Id
-	allocatedByCapc := publicAddress.Allocated == ""
+	alreadyAllocated := publicAddress.Allocated != ""
 
-	if publicAddress.Allocated != "" && publicAddress.Associatednetworkid == csCluster.Status.NetworkID {
+	if alreadyAllocated && publicAddress.Associatednetworkid == csCluster.Status.NetworkID {
 		// Address already allocated to network. Allocated is a timestamp -- not a boolean.
-		return c.AddClusterTag(ResourceTypeIPAddress, publicAddress.Id, csCluster, allocatedByCapc)
+		return c.AddClusterTag(ResourceTypeIPAddress, publicAddress.Id, csCluster, false)
 	} // Address not yet allocated. Allocate now.
 
 	// Public IP found, but not yet allocated to network.
@@ -168,10 +175,13 @@ func (c *client) AssociatePublicIPAddress(csCluster *infrav1.CloudStackCluster)
 	if _, err := c.cs.Address.AssociateIpAddress(p); err != nil {
 		return err
 	}
-	return c.AddClusterTag(ResourceTypeIPAddress, publicAddress.Id, csCluster, allocatedByCapc)
+	return c.AddClusterTag(ResourceTypeIPAddress, publicAddress.Id, csCluster, !alreadyAllocated)
 }
 
 func (c *client) DisassociatePublicIPAddress(csCluster *infrav1.CloudStackCluster) (retErr error) {
+	// Remove the CAPC creation tag, so it won't be there the next time this address is associated.
+	c.DeleteCreatedByCAPCTag(ResourceTypeIPAddress, csCluster.Status.PublicIPID)
+
 	p := c.cs.Address.NewDisassociateIpAddressParams(csCluster.Status.PublicIPID)
 	_, retErr = c.cs.Address.DisassociateIpAddress(p)
 	return retErr

pkg/cloud/tags.go

@@ -24,6 +24,7 @@ import (
 type TagIface interface {
 	AddClusterTag(resourceType ResourceType, resourceID string, csCluster *infrav1.CloudStackCluster, addCreatedByCAPCTag bool) error
 	DeleteClusterTag(resourceType ResourceType, resourceID string, csCluster *infrav1.CloudStackCluster) error
+	DeleteCreatedByCAPCTag(resourceType ResourceType, resourceID string) error
 	DoClusterTagsAllowDisposal(resourceType ResourceType, resourceID string) (bool, error)
 	AddTags(resourceType ResourceType, resourceID string, tags map[string]string) error
 	GetTags(resourceType ResourceType, resourceID string) (map[string]string, error)
@@ -71,7 +72,20 @@ func (c *client) DeleteClusterTag(resourceType ResourceType, resourceID string,
 
 	clusterTagName := generateClusterTagName(csCluster)
 	if tagValue := tags[clusterTagName]; tagValue != "" {
-		return c.DeleteTags(resourceType, csCluster.Status.NetworkID, map[string]string{clusterTagName: tagValue})
+		return c.DeleteTags(resourceType, resourceID, map[string]string{clusterTagName: tagValue})
+	}
+
+	return nil
+}
+
+func (c *client) DeleteCreatedByCAPCTag(resourceType ResourceType, resourceID string) error {
+	tags, err := c.GetTags(resourceType, resourceID)
+	if err != nil {
+		return err
+	}
+
+	if tagValue := tags[createdByCAPCTagName]; tagValue != "" {
+		return c.DeleteTags(resourceType, resourceID, map[string]string{createdByCAPCTagName: tagValue})
 	}
 
 	return nil