Make network & VPC offering configurable

Author: vishesh92

api/v1beta3/cloudstackfailuredomain_types.go

@@ -62,6 +62,13 @@ type Network struct {
 	// +optional
 	Netmask string `json:"netmask,omitempty"`
 
+	// Cloudstack Network Offering the cluster is built in.
+	// Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
+	// isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
+	// for VPC networks.
+	// +optional
+	Offering string `json:"offering,omitempty"`
+
 	// Cloudstack VPC the network belongs to.
 	// +optional
 	VPC *VPC `json:"vpc,omitempty"`
@@ -79,6 +86,11 @@ type VPC struct {
 	// CIDR for the VPC.
 	// +optional
 	CIDR string `json:"cidr,omitempty"`
+
+	// Cloudstack VPC Offering for the network.
+	// Default is "Default VPC offering"
+	// +optional
+	Offering string `json:"offering,omitempty"`
 }
 
 // CloudStackZoneSpec specifies a Zone's details.

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -48,6 +48,13 @@ type CloudStackIsolatedNetworkSpec struct {
 	// +optional
 	Netmask string `json:"netmask,omitempty"`
 
+	// Offering for the network.
+	// Default is "DefaultIsolatedNetworkOfferingWithSourceNatService" for
+	// isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
+	// for VPC networks.
+	// +optional
+	Offering string `json:"offering,omitempty"`
+
 	// VPC the network belongs to.
 	// +optional
 	VPC *VPC `json:"vpc,omitempty"`
@@ -67,12 +74,13 @@ type CloudStackIsolatedNetworkStatus struct {
 
 func (n *CloudStackIsolatedNetwork) Network() *Network {
 	return &Network{
-		Name:    n.Spec.Name,
-		Type:    "IsolatedNetwork",
-		ID:      n.Spec.ID,
-		Gateway: n.Spec.Gateway,
-		Netmask: n.Spec.Netmask,
-		VPC:     n.Spec.VPC,
+		Name:     n.Spec.Name,
+		Type:     "IsolatedNetwork",
+		ID:       n.Spec.ID,
+		Gateway:  n.Spec.Gateway,
+		Netmask:  n.Spec.Netmask,
+		VPC:      n.Spec.VPC,
+		Offering: n.Spec.Offering,
 	}
 }
 

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

@@ -407,6 +407,12 @@ spec:
                               description: Cloudstack Network Netmask the cluster
                                 is built in.
                               type: string
+                            offering:
+                              description: Cloudstack Network Offering the cluster
+                                is built in. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
+                                for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
+                                for VPC networks.
+                              type: string
                             type:
                               description: Cloudstack Network Type the cluster is
                                 built in.
@@ -423,6 +429,10 @@ spec:
                                 name:
                                   description: Cloudstack VPC Name of the network.
                                   type: string
+                                offering:
+                                  description: Cloudstack VPC Offering for the network.
+                                    Default is "Default VPC offering"
+                                  type: string
                               type: object
                           required:
                           - name

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

@@ -184,6 +184,12 @@ spec:
                         description: Cloudstack Network Netmask the cluster is built
                           in.
                         type: string
+                      offering:
+                        description: Cloudstack Network Offering the cluster is built
+                          in. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
+                          for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
+                          for VPC networks.
+                        type: string
                       type:
                         description: Cloudstack Network Type the cluster is built
                           in.
@@ -200,6 +206,10 @@ spec:
                           name:
                             description: Cloudstack VPC Name of the network.
                             type: string
+                          offering:
+                            description: Cloudstack VPC Offering for the network.
+                              Default is "Default VPC offering"
+                            type: string
                         type: object
                     required:
                     - name

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

@@ -204,6 +204,11 @@ spec:
               netmask:
                 description: Netmask for the network.
                 type: string
+              offering:
+                description: Offering for the network. Default is "DefaultIsolatedNetworkOfferingWithSourceNatService"
+                  for isolated networks and "DefaultIsolatedNetworkOfferingForVpcNetworks"
+                  for VPC networks.
+                type: string
               vpc:
                 description: VPC the network belongs to.
                 properties:
@@ -216,6 +221,10 @@ spec:
                   name:
                     description: Cloudstack VPC Name of the network.
                     type: string
+                  offering:
+                    description: Cloudstack VPC Offering for the network. Default
+                      is "Default VPC offering"
+                    type: string
                 type: object
             required:
             - controlPlaneEndpoint

pkg/cloud/isolated_network.go

@@ -112,6 +112,10 @@ func (c *client) CreateIsolatedNetwork(fd *infrav1.CloudStackFailureDomain, isoN
 		offeringName = NetVPCOffering
 	}
 
+	if isoNet.Spec.Offering != "" {
+		offeringName = isoNet.Spec.Offering
+	}
+
 	// Get network offering ID.
 	offeringID, err := c.getOfferingID(offeringName)
 	if err != nil {

pkg/cloud/network.go

@@ -65,6 +65,7 @@ func (c *client) ResolveNetwork(net *infrav1.Network) (retErr error) {
 		net.Type = netDetails.Type
 		net.Gateway = netDetails.Gateway
 		net.Netmask = netDetails.Netmask
+		net.Offering = netDetails.Networkofferingname
 		if netDetails.Vpcid != "" {
 			if net.VPC == nil {
 				net.VPC = &infrav1.VPC{}
@@ -88,6 +89,7 @@ func (c *client) ResolveNetwork(net *infrav1.Network) (retErr error) {
 	net.Type = netDetails.Type
 	net.Gateway = netDetails.Gateway
 	net.Netmask = netDetails.Netmask
+	net.Offering = netDetails.Networkofferingname
 	if netDetails.Vpcid != "" {
 		if net.VPC == nil {
 			net.VPC = &infrav1.VPC{}

pkg/cloud/vpc.go

@@ -40,8 +40,8 @@ type VPCIface interface {
 }
 
 // getVPCOfferingID fetches a vpc offering id.
-func (c *client) getVPCOfferingID() (string, error) {
-	offeringID, count, retErr := c.cs.VPC.GetVPCOfferingID(VPCOffering)
+func (c *client) getVPCOfferingID(offeringName string) (string, error) {
+	offeringID, count, retErr := c.cs.VPC.GetVPCOfferingID(offeringName)
 	if retErr != nil {
 		c.customMetrics.EvaluateErrorAndIncrementAcsReconciliationErrorCounter(retErr)
 		return "", retErr
@@ -70,6 +70,7 @@ func (c *client) ResolveVPC(vpc *infrav1.VPC) error {
 		}
 		vpc.Name = resp.Name
 		vpc.CIDR = resp.Cidr
+		vpc.Offering = resp.Vpcofferingname
 		return nil
 	}
 
@@ -84,6 +85,7 @@ func (c *client) ResolveVPC(vpc *infrav1.VPC) error {
 	}
 	vpc.ID = resp.Id
 	vpc.CIDR = resp.Cidr
+	vpc.Offering = resp.Vpcofferingname
 	return nil
 }
 
@@ -93,7 +95,12 @@ func (c *client) CreateVPC(fd *infrav1.CloudStackFailureDomain, vpc *infrav1.VPC
 		return errors.New("VPC name must be specified")
 	}
 
-	offeringID, err := c.getVPCOfferingID()
+	offeringName := VPCOffering
+	if vpc.Offering != "" {
+		offeringName = vpc.Offering
+	}
+
+	offeringID, err := c.getVPCOfferingID(offeringName)
 	if err != nil {
 		return err
 	}