Add VPC Support

Author: vishesh92

api/v1beta3/cloudstackfailuredomain_types.go

@@ -53,6 +53,20 @@ type Network struct {
 
 	// Cloudstack Network Name the cluster is built in.
 	Name string `json:"name"`
+
+	// Cloudstack VPC the network belongs to.
+	// +optional
+	VPC VPC `json:"vpc,omitempty"`
+}
+
+type VPC struct {
+	// Cloudstack VPC ID of the network.
+	// +optional
+	ID string `json:"id,omitempty"`
+
+	// Cloudstack VPC Name of the network.
+	// +optional
+	Name string `json:"name"`
 }
 
 // CloudStackZoneSpec specifies a Zone's details.

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -39,6 +39,10 @@ type CloudStackIsolatedNetworkSpec struct {
 
 	// FailureDomainName -- the FailureDomain the network is placed in.
 	FailureDomainName string `json:"failureDomainName"`
+
+	// VPC the network belongs to.
+	// +optional
+	VPC VPC `json:"vpc,omitempty"`
 }
 
 // CloudStackIsolatedNetworkStatus defines the observed state of CloudStackIsolatedNetwork
@@ -57,7 +61,8 @@ func (n *CloudStackIsolatedNetwork) Network() *Network {
 	return &Network{
 		Name: n.Spec.Name,
 		Type: "IsolatedNetwork",
-		ID:   n.Spec.ID}
+		ID:   n.Spec.ID,
+		VPC:  n.Spec.VPC}
 }
 
 //+kubebuilder:object:root=true

api/v1beta3/zz_generated.deepcopy.go

@@ -403,6 +403,16 @@ spec:
                               description: Cloudstack Network Type the cluster is
                                 built in.
                               type: string
+                            vpc:
+                              description: Cloudstack VPC the network belongs to.
+                              properties:
+                                id:
+                                  description: Cloudstack VPC ID of the network.
+                                  type: string
+                                name:
+                                  description: Cloudstack VPC Name of the network.
+                                  type: string
+                              type: object
                           required:
                           - name
                           type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackclusters.yaml

@@ -180,6 +180,16 @@ spec:
                         description: Cloudstack Network Type the cluster is built
                           in.
                         type: string
+                      vpc:
+                        description: Cloudstack VPC the network belongs to.
+                        properties:
+                          id:
+                            description: Cloudstack VPC ID of the network.
+                            type: string
+                          name:
+                            description: Cloudstack VPC Name of the network.
+                            type: string
+                        type: object
                     required:
                     - name
                     type: object

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackfailuredomains.yaml

@@ -198,6 +198,16 @@ spec:
               name:
                 description: Name.
                 type: string
+              vpc:
+                description: VPC the network belongs to.
+                properties:
+                  id:
+                    description: Cloudstack VPC ID of the network.
+                    type: string
+                  name:
+                    description: Cloudstack VPC Name of the network.
+                    type: string
+                type: object
             required:
             - controlPlaneEndpoint
             - failureDomainName

config/crd/bases/infrastructure.cluster.x-k8s.io_cloudstackisolatednetworks.yaml

@@ -45,6 +45,7 @@ type Client interface {
 	ZoneIFace
 	IsoNetworkIface
 	UserCredIFace
+	VPCIface
 	NewClientInDomainAndAccount(string, string, string) (Client, error)
 }
 

pkg/cloud/client.go

@@ -67,15 +67,18 @@ func (c *client) AssociatePublicIPAddress(
 	csCluster.Spec.ControlPlaneEndpoint.Host = publicAddress.Ipaddress
 	isoNet.Status.PublicIPID = publicAddress.Id
 
-	// Check if the address is already associated with the network.
-	if publicAddress.Associatednetworkid == isoNet.Spec.ID {
+	// Check if the address is already associated with the network or VPC.
+	if publicAddress.Associatednetworkid == isoNet.Spec.ID || publicAddress.Vpcid == isoNet.Spec.VPC.ID {
 		return nil
 	}
 
 	// Public IP found, but not yet associated with network -- associate it.
 	p := c.cs.Address.NewAssociateIpAddressParams()
 	p.SetIpaddress(isoNet.Spec.ControlPlaneEndpoint.Host)
 	p.SetNetworkid(isoNet.Spec.ID)
+	if isoNet.Spec.VPC.ID != "" {
+		p.SetVpcid(isoNet.Spec.VPC.ID)
+	}
 	setIfNotEmpty(c.user.Project.ID, p.SetProjectid)
 	if _, err := c.cs.Address.AssociateIpAddress(p); err != nil {
 		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
@@ -100,10 +103,61 @@ func (c *client) CreateIsolatedNetwork(fd *infrav1.CloudStackFailureDomain, isoN
 		return err
 	}
 
+	// First, check if VPC is specified and handle it
+	if isoNet.Spec.VPC.Name != "" || isoNet.Spec.VPC.ID != "" {
+		// Try to resolve or create the VPC
+		err := c.ResolveVPC(&isoNet.Spec.VPC)
+		if err != nil {
+			return errors.Wrap(err, "resolving VPC for isolated network")
+			// }
+
+			// TODO: Handle VPC creation
+
+			// // VPC not found, need to create it
+			// // First, get a VPC offering ID
+			// vpcOfferingParams := c.cs.VPC.NewListVPCOfferingsParams()
+			// vpcOfferingResp, err := c.cs.VPC.ListVPCOfferings(vpcOfferingParams)
+			// if err != nil {
+			// 	c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+			// 	return errors.Wrap(err, "listing VPC offerings")
+			// }
+			// if vpcOfferingResp.Count == 0 {
+			// 	return errors.New("no VPC offerings available")
+			// }
+
+			// // Use the first VPC offering
+			// vpcOfferingID := vpcOfferingResp.VPCOfferings[0].Id
+
+			// // Create the VPC
+			// vpcParams := c.cs.VPC.NewCreateVPCParams(isoNet.Spec.VPC.Name, vpcOfferingID, fd.Spec.Zone.ID)
+			// vpcParams.SetDisplaytext(isoNet.Spec.VPC.Name)
+			// setIfNotEmpty(c.user.Project.ID, vpcParams.SetProjectid)
+
+			// vpcResp, err := c.cs.VPC.CreateVPC(vpcParams)
+			// if err != nil {
+			// 	c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+			// 	return errors.Wrapf(err, "creating VPC with name %s", isoNet.Spec.VPC.Name)
+			// }
+
+			// isoNet.Spec.VPC.ID = vpcResp.Id
+
+			// // Tag the VPC
+			// if err := c.AddCreatedByCAPCTag(ResourceTypeVPC, isoNet.Spec.VPC.ID); err != nil {
+			// 	return errors.Wrapf(err, "tagging VPC with ID %s", isoNet.Spec.VPC.ID)
+			// }
+		}
+	}
+
 	// Do isolated network creation.
 	p := c.cs.Network.NewCreateNetworkParams(isoNet.Spec.Name, offeringID, fd.Spec.Zone.ID)
 	p.SetDisplaytext(isoNet.Spec.Name)
 	setIfNotEmpty(c.user.Project.ID, p.SetProjectid)
+
+	// If VPC is specified, set the VPC ID for the network
+	if isoNet.Spec.VPC.ID != "" {
+		p.SetVpcid(isoNet.Spec.VPC.ID)
+	}
+
 	resp, err := c.cs.Network.CreateNetwork(p)
 	if err != nil {
 		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)

pkg/cloud/isolated_network.go

@@ -62,6 +62,10 @@ func (c *client) ResolveNetwork(net *infrav1.Network) (retErr error) {
 	} else { // Got netID from the network's name.
 		net.ID = netDetails.Id
 		net.Type = netDetails.Type
+		if netDetails.Vpcid != "" {
+			net.VPC.ID = netDetails.Vpcid
+			net.VPC.Name = netDetails.Vpcname
+		}
 		return nil
 	}
 
@@ -76,6 +80,10 @@ func (c *client) ResolveNetwork(net *infrav1.Network) (retErr error) {
 	net.Name = netDetails.Name
 	net.ID = netDetails.Id
 	net.Type = netDetails.Type
+	if netDetails.Vpcid != "" {
+		net.VPC.ID = netDetails.Vpcid
+		net.VPC.Name = netDetails.Vpcname
+	}
 	return nil
 }
 

pkg/cloud/network.go

@@ -0,0 +1,113 @@
+/*
+Copyright 2024 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+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"
+	"github.com/pkg/errors"
+)
+
+// ResourceTypeVPC is the type identifier for VPC resources.
+const ResourceTypeVPC = "VPC"
+
+// VPCIface defines the interface for VPC operations.
+type VPCIface interface {
+	ResolveVPC(*infrav1.VPC) error
+	CreateVPC(*infrav1.VPC) error
+	GetOrCreateVPC(*infrav1.VPC) error
+}
+
+// ResolveVPC checks if the specified VPC exists by ID or name.
+// If it exists, it updates the VPC struct with the resolved ID or name.
+func (c *client) ResolveVPC(vpc *infrav1.VPC) error {
+	if vpc == nil || (vpc.ID == "" && vpc.Name == "") {
+		return nil
+	}
+
+	// If VPC ID is provided, check if it exists
+	if vpc.ID != "" {
+		resp, count, err := c.cs.VPC.GetVPCByID(vpc.ID, cloudstack.WithProject(c.user.Project.ID))
+		if err != nil {
+			c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+			return errors.Wrapf(err, "failed to get VPC with ID %s", vpc.ID)
+		}
+		if count == 0 {
+			return errors.Errorf("no VPC found with ID %s", vpc.ID)
+		}
+		vpc.Name = resp.Name
+		return nil
+	}
+
+	// If VPC name is provided, check if it exists
+	resp, count, err := c.cs.VPC.GetVPCByName(vpc.Name, cloudstack.WithProject(c.user.Project.ID))
+	if err != nil {
+		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+		return errors.Wrapf(err, "failed to get VPC with name %s", vpc.Name)
+	}
+	if count == 0 {
+		return errors.Errorf("no VPC found with name %s", vpc.Name)
+	}
+	vpc.ID = resp.Id
+	return nil
+}
+
+// GetOrCreateVPC ensures a VPC exists for the given specification.
+// If the VPC doesn't exist, it creates a new one.
+func (c *client) GetOrCreateVPC(vpc *infrav1.VPC) error {
+	if vpc == nil || (vpc.ID == "" && vpc.Name == "") {
+		return nil
+	}
+
+	// Try to resolve the VPC
+	err := c.ResolveVPC(vpc)
+	if err != nil {
+		// If it's a "not found" error and we have a name, create the VPC
+		if strings.Contains(err.Error(), "no VPC found") && vpc.Name != "" {
+			return c.CreateVPC(vpc)
+		}
+		return err
+	}
+
+	return nil
+}
+
+// CreateVPC creates a new VPC in CloudStack.
+func (c *client) CreateVPC(vpc *infrav1.VPC) error {
+	if vpc == nil || vpc.Name == "" {
+		return errors.New("VPC name must be specified")
+	}
+
+	// Get VPC offering ID
+	p := c.cs.VPC.NewListVPCOfferingsParams()
+	resp, err := c.cs.VPC.ListVPCOfferings(p)
+	if err != nil {
+		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(err)
+		return errors.Wrap(err, "failed to list VPC offerings")
+	}
+	if resp.Count == 0 {
+		return errors.New("no VPC offerings available")
+	}
+
+	// Since the SDK's VPC creation API might have compatibility issues with different CloudStack versions,
+	// we'll need to handle this in the implementation of the network creation rather than here.
+	// For now, we'll just return a "not implemented" error, and handle VPC creation in the isolated network creation.
+	return errors.New("creating VPC not directly implemented; handled in isolated network creation")
+}