fixup

Author: vishesh92

api/v1beta1/conversion.go

@@ -174,3 +174,14 @@ func GetK8sSecret(name, namespace string) (*corev1.Secret, error) {
 	}
 	return endpointCredentials, nil
 }
+
+// Convert_v1beta3_Network_To_v1beta1_Network converts from v1beta3.Network to v1beta1.Network
+//
+//nolint:golint,revive,stylecheck
+func Convert_v1beta3_Network_To_v1beta1_Network(in *v1beta3.Network, out *Network, _ conv.Scope) error {
+	out.ID = in.ID
+	out.Type = in.Type
+	out.Name = in.Name
+	// Skip Gateway, Netmask, and VPC fields as they do not exist in v1beta1.Network
+	return nil
+}

api/v1beta1/zz_generated.conversion.go

@@ -15,3 +15,31 @@ limitations under the License.
 */
 
 package v1beta2
+
+import (
+	conv "k8s.io/apimachinery/pkg/conversion"
+	"sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
+)
+
+// Convert_v1beta3_Network_To_v1beta2_Network converts from v1beta3.Network to v1beta2.Network
+//
+//nolint:golint,revive,stylecheck
+func Convert_v1beta3_Network_To_v1beta2_Network(in *v1beta3.Network, out *Network, _ conv.Scope) error {
+	out.ID = in.ID
+	out.Type = in.Type
+	out.Name = in.Name
+	// Skip Gateway, Netmask, and VPC fields as they do not exist in v1beta2.Network
+	return nil
+}
+
+// Convert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta2_CloudStackIsolatedNetworkSpec converts from v1beta3.CloudStackIsolatedNetworkSpec to v1beta2.CloudStackIsolatedNetworkSpec
+//
+//nolint:golint,revive,stylecheck
+func Convert_v1beta3_CloudStackIsolatedNetworkSpec_To_v1beta2_CloudStackIsolatedNetworkSpec(in *v1beta3.CloudStackIsolatedNetworkSpec, out *CloudStackIsolatedNetworkSpec, _ conv.Scope) error {
+	out.Name = in.Name
+	out.ID = in.ID
+	out.ControlPlaneEndpoint = in.ControlPlaneEndpoint
+	out.FailureDomainName = in.FailureDomainName
+	// Skip Gateway, Netmask, and VPC fields as they do not exist in v1beta2.CloudStackIsolatedNetworkSpec
+	return nil
+}

api/v1beta2/conversion.go

@@ -107,7 +107,9 @@ func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.R
 		r.ReconciliationSubject.Spec.Zone.Network.Type == infrav1.NetworkTypeIsolated {
 		netName := r.ReconciliationSubject.Spec.Zone.Network.Name
 		if res, err := r.GenerateIsolatedNetwork(
-			netName, func() string { return r.ReconciliationSubject.Spec.Name }, r.ReconciliationSubject.Spec.Zone.Network)(); r.ShouldReturn(res, err) {
+			netName,
+			func() string { return r.ReconciliationSubject.Spec.Name },
+			r.ReconciliationSubject.Spec.Zone.Network)(); r.ShouldReturn(res, err) {
 			return res, err
 		} else if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
 			return res, err

api/v1beta2/zz_generated.conversion.go

@@ -143,6 +143,8 @@ func (c *client) CreateIsolatedNetwork(fd *infrav1.CloudStackFailureDomain, isoN
 		return errors.Wrapf(err, "creating network with name %s", isoNet.Spec.Name)
 	}
 	isoNet.Spec.ID = resp.Id
+	isoNet.Spec.Gateway = resp.Gateway
+	isoNet.Spec.Netmask = resp.Netmask
 	return c.AddCreatedByCAPCTag(ResourceTypeNetwork, isoNet.Spec.ID)
 }
 
@@ -204,31 +206,6 @@ func (c *client) GetPublicIP(
 	return nil, errors.New("no public addresses found in available networks")
 }
 
-// GetIsolatedNetwork gets an isolated network in the relevant Zone.
-func (c *client) GetIsolatedNetwork(isoNet *infrav1.CloudStackIsolatedNetwork) (retErr error) {
-	netDetails, count, err := c.cs.Network.GetNetworkByName(isoNet.Spec.Name, cloudstack.WithProject(c.user.Project.ID))
-	if err != nil {
-		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
-		retErr = multierror.Append(retErr, errors.Wrapf(err, "could not get Network ID from %s", isoNet.Spec.Name))
-	} else if count != 1 {
-		retErr = multierror.Append(retErr, errors.Errorf(
-			"expected 1 Network with name %s, but got %d", isoNet.Name, count))
-	} else { // Got netID from the network's name.
-		isoNet.Spec.ID = netDetails.Id
-		return nil
-	}
-
-	netDetails, count, err = c.cs.Network.GetNetworkByID(isoNet.Spec.ID, cloudstack.WithProject(c.user.Project.ID))
-	if err != nil {
-		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
-		return multierror.Append(retErr, errors.Wrapf(err, "could not get Network by ID %s", isoNet.Spec.ID))
-	} else if count != 1 {
-		return multierror.Append(retErr, errors.Errorf("expected 1 Network with UUID %s, but got %d", isoNet.Spec.ID, count))
-	}
-	isoNet.Name = netDetails.Name
-	return nil
-}
-
 // ResolveLoadBalancerRuleDetails resolves the details of a load balancer rule by PublicIPID and Port.
 func (c *client) ResolveLoadBalancerRuleDetails(
 	isoNet *infrav1.CloudStackIsolatedNetwork,
@@ -303,6 +280,11 @@ func (c *client) GetOrCreateIsolatedNetwork(
 		}
 	} else { // Network existed and was resolved. Set ID on isoNet CloudStackIsolatedNetwork in case it only had name set.
 		isoNet.Spec.ID = net.ID
+		isoNet.Spec.Gateway = net.Gateway
+		isoNet.Spec.Netmask = net.Netmask
+		if net.VPC != nil && net.VPC.ID != "" {
+			isoNet.Spec.VPC = net.VPC
+		}
 	}
 
 	// Tag the created network.
@@ -311,6 +293,13 @@ func (c *client) GetOrCreateIsolatedNetwork(
 		return errors.Wrapf(err, "tagging network with id %s", networkID)
 	}
 
+	// Tag the created VPC.
+	if net.VPC != nil && net.VPC.ID != "" {
+		if err := c.AddClusterTag(ResourceTypeVPC, net.VPC.ID, csCluster); err != nil {
+			return errors.Wrapf(err, "tagging VPC with id %s", net.VPC.ID)
+		}
+	}
+
 	// Associate Public IP with CloudStackIsolatedNetwork
 	if err := c.AssociatePublicIPAddress(fd, isoNet, csCluster); err != nil {
 		return errors.Wrapf(err, "associating public IP address to csCluster")
@@ -372,7 +361,13 @@ func (c *client) DisposeIsoNetResources(
 	if err := c.RemoveClusterTagFromNetwork(csCluster, *isoNet.Network()); err != nil {
 		return err
 	}
-	err := c.DeleteNetworkIfNotInUse(*isoNet.Network())
+	if err := c.RemoveClusterTagFromVPC(csCluster, isoNet.Spec.VPC); err != nil {
+		return err
+	}
+	if err := c.DeleteNetworkIfNotInUse(*isoNet.Network()); err != nil {
+		return err
+	}
+	err := c.DeleteVPCIfNotInUse(isoNet.Spec.VPC)
 	return err
 }
 

controllers/cloudstackfailuredomain_controller.go

@@ -17,6 +17,8 @@ limitations under the License.
 package cloud
 
 import (
+	"strings"
+
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta3"
 
 	"github.com/apache/cloudstack-go/v2/cloudstack"
@@ -25,14 +27,15 @@ import (
 
 // ResourceTypeVPC is the type identifier for VPC resources.
 const (
-	ResourceTypeVPC = "VPC"
+	ResourceTypeVPC = "Vpc"
 	VPCOffering     = "Default VPC offering"
 )
 
 // VPCIface defines the interface for VPC operations.
 type VPCIface interface {
 	ResolveVPC(*infrav1.VPC) error
 	CreateVPC(*infrav1.CloudStackFailureDomain, *infrav1.VPC) error
+	RemoveClusterTagFromVPC(*infrav1.CloudStackCluster, *infrav1.VPC) error
 }
 
 // getVPCOfferingID fetches a vpc offering id.
@@ -65,6 +68,7 @@ func (c *client) ResolveVPC(vpc *infrav1.VPC) error {
 			return errors.Errorf("no VPC found with ID %s", vpc.ID)
 		}
 		vpc.Name = resp.Name
+		vpc.CIDR = resp.Cidr
 		return nil
 	}
 
@@ -78,6 +82,7 @@ func (c *client) ResolveVPC(vpc *infrav1.VPC) error {
 		return errors.Errorf("no VPC found with name %s", vpc.Name)
 	}
 	vpc.ID = resp.Id
+	vpc.CIDR = resp.Cidr
 	return nil
 }
 
@@ -93,12 +98,67 @@ func (c *client) CreateVPC(fd *infrav1.CloudStackFailureDomain, vpc *infrav1.VPC
 	}
 
 	p := c.cs.VPC.NewCreateVPCParams(vpc.CIDR, vpc.Name, vpc.Name, offeringID, fd.Spec.Zone.ID)
-
+	setIfNotEmpty(c.user.Project.ID, p.SetProjectid)
 	resp, err := c.cs.VPC.CreateVPC(p)
 	if err != nil {
 		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
 		return errors.Wrapf(err, "creating VPC with name %s", vpc.Name)
 	}
 	vpc.ID = resp.Id
+	return c.AddCreatedByCAPCTag(ResourceTypeVPC, vpc.ID)
+}
+
+// DeleteVPC deletes a VPC.
+func (c *client) DeleteVPC(vpc *infrav1.VPC) error {
+	_, err := c.cs.VPC.DeleteVPC(c.cs.VPC.NewDeleteVPCParams(vpc.ID))
+	c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+	return errors.Wrapf(err, "deleting vpc with id %s", vpc.ID)
+}
+
+// DeleteVPCIfNotInUse deletes a VPC if the VPC is no longer in use (indicated by in use tags).
+func (c *client) DeleteVPCIfNotInUse(vpc *infrav1.VPC) (retError error) {
+	if vpc == nil || vpc.ID == "" {
+		return nil
+	}
+	tags, err := c.GetTags(ResourceTypeVPC, vpc.ID)
+	if err != nil {
+		return err
+	}
+
+	var clusterTagCount int
+	for tagName := range tags {
+		if strings.HasPrefix(tagName, ClusterTagNamePrefix) {
+			clusterTagCount++
+		}
+	}
+
+	if clusterTagCount == 0 && tags[CreatedByCAPCTagName] != "" {
+		return c.DeleteVPC(vpc)
+	}
+
+	return nil
+}
+
+func generateVPCTagName(csCluster *infrav1.CloudStackCluster) string {
+	return ClusterTagNamePrefix + string(csCluster.UID)
+}
+
+// RemoveClusterTagFromVPC removes the cluster in use tag from a VPC.
+func (c *client) RemoveClusterTagFromVPC(csCluster *infrav1.CloudStackCluster, vpc *infrav1.VPC) (retError error) {
+	if vpc == nil || vpc.ID == "" {
+		return nil
+	}
+	tags, err := c.GetTags(ResourceTypeVPC, vpc.ID)
+	if err != nil {
+		return err
+	}
+
+	ClusterTagName := generateVPCTagName(csCluster)
+	if tagValue := tags[ClusterTagName]; tagValue != "" {
+		if err = c.DeleteTags(ResourceTypeVPC, vpc.ID, map[string]string{ClusterTagName: tagValue}); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }

pkg/cloud/isolated_network.go

@@ -34,6 +34,7 @@ var _ = ginkgo.Describe("VPC", func() {
 		mockCtrl   *gomock.Controller
 		mockClient *csapi.CloudStackClient
 		vs         *csapi.MockVPCServiceIface
+		rs         *csapi.MockResourcetagsServiceIface
 		client     cloud.Client
 	)
 
@@ -42,6 +43,7 @@ var _ = ginkgo.Describe("VPC", func() {
 		mockCtrl = gomock.NewController(ginkgo.GinkgoT())
 		mockClient = csapi.NewMockClient(mockCtrl)
 		vs = mockClient.VPC.(*csapi.MockVPCServiceIface)
+		rs = mockClient.Resourcetags.(*csapi.MockResourcetagsServiceIface)
 		client = cloud.NewClientFromCSAPIClient(mockClient, nil)
 		dummies.SetDummyVars()
 	})
@@ -166,6 +168,8 @@ var _ = ginkgo.Describe("VPC", func() {
 			vs.EXPECT().GetVPCOfferingID(cloud.VPCOffering).Return(offeringID, 1, nil)
 			vs.EXPECT().NewCreateVPCParams(dummyVPC.CIDR, dummyVPC.Name, dummyVPC.Name, offeringID, dummyFD.Spec.Zone.ID).Return(createVPCParams)
 			vs.EXPECT().CreateVPC(createVPCParams).Return(createVPCResponse, nil)
+			rs.EXPECT().NewCreateTagsParams(gomock.Any(), gomock.Any(), gomock.Any()).Return(&csapi.CreateTagsParams{})
+			rs.EXPECT().CreateTags(gomock.Any()).Return(&csapi.CreateTagsResponse{}, nil)
 
 			gomega.Ω(client.CreateVPC(&dummyFD, &dummyVPC)).Should(gomega.Succeed())
 			gomega.Ω(dummyVPC.ID).Should(gomega.Equal("vpc-123"))

pkg/cloud/vpc.go

@@ -393,6 +393,19 @@ func CheckNetworkExists(client *cloudstack.CloudStackClient, networkName string)
 	return count == 1, nil
 }
 
+func CheckVPCExists(client *cloudstack.CloudStackClient, vpcName string) (bool, error) {
+	_, count, err := client.VPC.GetVPCByName(vpcName)
+	if err != nil {
+		if strings.Contains(err.Error(), "No match found for") {
+			return false, nil
+		}
+		return false, err
+	} else if count > 1 {
+		return false, fmt.Errorf("Expected 0-1 VPC with name %s, but got %d.", vpcName, count)
+	}
+	return count == 1, nil
+}
+
 func CreateCloudStackClient(ctx context.Context, kubeConfigPath string) *cloudstack.CloudStackClient {
 	By("Getting a CloudStack client secret")
 	secret := &corev1.Secret{}