Create VPC if it doesn't exit

Author: vishesh92

api/v1beta1/zz_generated.conversion.go

@@ -54,9 +54,17 @@ type Network struct {
 	// Cloudstack Network Name the cluster is built in.
 	Name string `json:"name"`
 
+	// Cloudstack Network Gateway the cluster is built in.
+	// +optional
+	Gateway string `json:"gateway,omitempty"`
+
+	// Cloudstack Network Netmask the cluster is built in.
+	// +optional
+	Netmask string `json:"netmask,omitempty"`
+
 	// Cloudstack VPC the network belongs to.
 	// +optional
-	VPC VPC `json:"vpc,omitempty"`
+	VPC *VPC `json:"vpc,omitempty"`
 }
 
 type VPC struct {
@@ -67,6 +75,10 @@ type VPC struct {
 	// Cloudstack VPC Name of the network.
 	// +optional
 	Name string `json:"name"`
+
+	// CIDR for the VPC.
+	// +optional
+	CIDR string `json:"cidr,omitempty"`
 }
 
 // CloudStackZoneSpec specifies a Zone's details.

api/v1beta2/zz_generated.conversion.go

@@ -40,9 +40,17 @@ type CloudStackIsolatedNetworkSpec struct {
 	// FailureDomainName -- the FailureDomain the network is placed in.
 	FailureDomainName string `json:"failureDomainName"`
 
+	// Gateway for the network.
+	// +optional
+	Gateway string `json:"gateway,omitempty"`
+
+	// Netmask for the network.
+	// +optional
+	Netmask string `json:"netmask,omitempty"`
+
 	// VPC the network belongs to.
 	// +optional
-	VPC VPC `json:"vpc,omitempty"`
+	VPC *VPC `json:"vpc,omitempty"`
 }
 
 // CloudStackIsolatedNetworkStatus defines the observed state of CloudStackIsolatedNetwork
@@ -59,10 +67,13 @@ type CloudStackIsolatedNetworkStatus struct {
 
 func (n *CloudStackIsolatedNetwork) Network() *Network {
 	return &Network{
-		Name: n.Spec.Name,
-		Type: "IsolatedNetwork",
-		ID:   n.Spec.ID,
-		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,
+	}
 }
 
 //+kubebuilder:object:root=true

api/v1beta3/cloudstackfailuredomain_types.go

@@ -391,6 +391,10 @@ spec:
                         network:
                           description: The network within the Zone to use.
                           properties:
+                            gateway:
+                              description: Cloudstack Network Gateway the cluster
+                                is built in.
+                              type: string
                             id:
                               description: Cloudstack Network ID the cluster is built
                                 in.
@@ -399,13 +403,20 @@ spec:
                               description: Cloudstack Network Name the cluster is
                                 built in.
                               type: string
+                            netmask:
+                              description: Cloudstack Network Netmask the cluster
+                                is built in.
+                              type: string
                             type:
                               description: Cloudstack Network Type the cluster is
                                 built in.
                               type: string
                             vpc:
                               description: Cloudstack VPC the network belongs to.
                               properties:
+                                cidr:
+                                  description: CIDR for the VPC.
+                                  type: string
                                 id:
                                   description: Cloudstack VPC ID of the network.
                                   type: string

api/v1beta3/cloudstackisolatednetwork_types.go

@@ -169,20 +169,31 @@ spec:
                   network:
                     description: The network within the Zone to use.
                     properties:
+                      gateway:
+                        description: Cloudstack Network Gateway the cluster is built
+                          in.
+                        type: string
                       id:
                         description: Cloudstack Network ID the cluster is built in.
                         type: string
                       name:
                         description: Cloudstack Network Name the cluster is built
                           in.
                         type: string
+                      netmask:
+                        description: Cloudstack Network Netmask the cluster is built
+                          in.
+                        type: string
                       type:
                         description: Cloudstack Network Type the cluster is built
                           in.
                         type: string
                       vpc:
                         description: Cloudstack VPC the network belongs to.
                         properties:
+                          cidr:
+                            description: CIDR for the VPC.
+                            type: string
                           id:
                             description: Cloudstack VPC ID of the network.
                             type: string

api/v1beta3/zz_generated.deepcopy.go

@@ -192,15 +192,24 @@ spec:
                 description: FailureDomainName -- the FailureDomain the network is
                   placed in.
                 type: string
+              gateway:
+                description: Gateway for the network.
+                type: string
               id:
                 description: ID.
                 type: string
               name:
                 description: Name.
                 type: string
+              netmask:
+                description: Netmask for the network.
+                type: string
               vpc:
                 description: VPC the network belongs to.
                 properties:
+                  cidr:
+                    description: CIDR for the VPC.
+                    type: string
                   id:
                     description: Cloudstack VPC ID of the network.
                     type: string

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

@@ -107,7 +107,7 @@ 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.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

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

@@ -33,7 +33,7 @@ func (r *ReconciliationRunner) IsoNetMetaName(name string) string {
 }
 
 // GenerateIsolatedNetwork of the passed name that's owned by the ReconciliationSubject.
-func (r *ReconciliationRunner) GenerateIsolatedNetwork(name string, fdNameFunc func() string) CloudStackReconcilerMethod {
+func (r *ReconciliationRunner) GenerateIsolatedNetwork(name string, fdNameFunc func() string, network infrav1.Network) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
 		lowerName := strings.ToLower(name)
 		metaName := r.IsoNetMetaName(lowerName)
@@ -43,6 +43,12 @@ func (r *ReconciliationRunner) GenerateIsolatedNetwork(name string, fdNameFunc f
 		csIsoNet.Spec.FailureDomainName = fdNameFunc()
 		csIsoNet.Spec.ControlPlaneEndpoint.Host = r.CSCluster.Spec.ControlPlaneEndpoint.Host
 		csIsoNet.Spec.ControlPlaneEndpoint.Port = r.CSCluster.Spec.ControlPlaneEndpoint.Port
+		csIsoNet.Spec.Gateway = network.Gateway
+		csIsoNet.Spec.Netmask = network.Netmask
+
+		if network.VPC != nil {
+			csIsoNet.Spec.VPC = network.VPC
+		}
 
 		if err := r.K8sClient.Create(r.RequestCtx, csIsoNet); err != nil && !ContainsAlreadyExistsSubstring(err) {
 			return r.ReturnWrappedError(err, "creating isolated network CRD")