Add ID in the network spec

Author: harikrishna-patnala

api/v1beta3/cloudstackmachine_types.go

@@ -33,10 +33,14 @@ const (
 )
 
 type NetworkSpec struct {
-	// The name of the network
+	// CloudStack Network Name (required to resolve ID)
 	Name string `json:"name"`
-	// Optional static IP in that network
+
+	// Optional IP in the network
 	IP string `json:"ip,omitempty"`
+
+	// Optional Network ID (overrides Name if set)
+	ID string `json:"id,omitempty"`
 }
 
 // CloudStackMachineSpec defines the desired state of CloudStackMachine
@@ -62,13 +66,10 @@ type CloudStackMachineSpec struct {
 	// +optional
 	DiskOffering CloudStackResourceDiskOffering `json:"diskOffering,omitempty"`
 
-	// The primary network interface (overrides zone.network)
-	// +optional
-	Network *NetworkSpec `json:"network,omitempty"`
-
-	// Additional networks (attached as secondary NICs)
+	// The list of networks (overrides zone.network)
 	// +optional
-	ExtraNetworks []NetworkSpec `json:"extraNetworks,omitempty"`
+	// In CloudStackMachineSpec
+	Networks []NetworkSpec `json:"networks,omitempty"`
 
 	// CloudStack ssh key to use.
 	// +optional

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

@@ -645,20 +645,6 @@ spec:
                 - label
                 - mountPath
                 type: object
-              extraNetworks:
-                description: Additional networks (attached as secondary NICs)
-                items:
-                  properties:
-                    ip:
-                      description: Optional static IP in that network
-                      type: string
-                    name:
-                      description: The name of the network
-                      type: string
-                  required:
-                  - name
-                  type: object
-                type: array
               failureDomainName:
                 description: FailureDomainName -- the name of the FailureDomain the
                   machine is placed in.
@@ -673,18 +659,25 @@ spec:
               name:
                 description: Name.
                 type: string
-              network:
-                description: The primary network interface (overrides zone.network)
-                properties:
-                  ip:
-                    description: Optional static IP in that network
-                    type: string
-                  name:
-                    description: The name of the network
-                    type: string
-                required:
-                - name
-                type: object
+              networks:
+                description: |-
+                  The list of networks (overrides zone.network)
+                  In CloudStackMachineSpec
+                items:
+                  properties:
+                    id:
+                      description: Optional Network ID (overrides Name if set)
+                      type: string
+                    ip:
+                      description: Optional IP in the network
+                      type: string
+                    name:
+                      description: CloudStack Network Name (required to resolve ID)
+                      type: string
+                  required:
+                  - name
+                  type: object
+                type: array
               offering:
                 description: CloudStack compute offering.
                 properties:

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

@@ -580,20 +580,6 @@ spec:
                         - label
                         - mountPath
                         type: object
-                      extraNetworks:
-                        description: Additional networks (attached as secondary NICs)
-                        items:
-                          properties:
-                            ip:
-                              description: Optional static IP in that network
-                              type: string
-                            name:
-                              description: The name of the network
-                              type: string
-                          required:
-                          - name
-                          type: object
-                        type: array
                       failureDomainName:
                         description: FailureDomainName -- the name of the FailureDomain
                           the machine is placed in.
@@ -608,18 +594,27 @@ spec:
                       name:
                         description: Name.
                         type: string
-                      network:
-                        description: The primary network interface (overrides zone.network)
-                        properties:
-                          ip:
-                            description: Optional static IP in that network
-                            type: string
-                          name:
-                            description: The name of the network
-                            type: string
-                        required:
-                        - name
-                        type: object
+                      networks:
+                        description: |-
+                          The list of networks (overrides zone.network)
+                          In CloudStackMachineSpec
+                        items:
+                          properties:
+                            id:
+                              description: Optional Network ID (overrides Name if
+                                set)
+                              type: string
+                            ip:
+                              description: Optional IP in the network
+                              type: string
+                            name:
+                              description: CloudStack Network Name (required to resolve
+                                ID)
+                              type: string
+                          required:
+                          - name
+                          type: object
+                        type: array
                       offering:
                         description: CloudStack compute offering.
                         properties:

pkg/cloud/instance.go

@@ -334,39 +334,23 @@ func (c *client) DeployVM(
 
 	p := c.cs.VirtualMachine.NewDeployVirtualMachineParams(offering.Id, templateID, fd.Spec.Zone.ID)
 
-	if csMachine.Spec.Network == nil && len(csMachine.Spec.ExtraNetworks) == 0 && fd.Spec.Zone.Network.ID != "" {
-		// No explicit NICs; fallback to single default network ID
+	if len(csMachine.Spec.Networks) == 0 && fd.Spec.Zone.Network.ID != "" {
 		p.SetNetworkids([]string{fd.Spec.Zone.Network.ID})
 	} else {
-		// Build ipToNetworkList for multiple NICs
 		ipToNetworkList := []map[string]string{}
 
-		// Primary NIC
-		if csMachine.Spec.Network != nil {
-			id, err := c.resolveNetworkIDByName(csMachine.Spec.Network.Name)
-			if err != nil {
-				return err
+		for _, net := range csMachine.Spec.Networks {
+			networkID := net.ID
+			if networkID == "" {
+				var err error
+				networkID, err = c.resolveNetworkIDByName(net.Name)
+				if err != nil {
+					return err
+				}
 			}
-			entry := map[string]string{"networkid": id}
-			if csMachine.Spec.Network.IP != "" {
-				entry["ip"] = csMachine.Spec.Network.IP
-			}
-			ipToNetworkList = append(ipToNetworkList, entry)
-		} else if fd.Spec.Zone.Network.ID != "" {
-			ipToNetworkList = append(ipToNetworkList, map[string]string{
-				"networkid": fd.Spec.Zone.Network.ID,
-			})
-		}
-
-		// Extra NICs
-		for _, extra := range csMachine.Spec.ExtraNetworks {
-			id, err := c.resolveNetworkIDByName(extra.Name)
-			if err != nil {
-				return err
-			}
-			entry := map[string]string{"networkid": id}
-			if extra.IP != "" {
-				entry["ip"] = extra.IP
+			entry := map[string]string{"networkid": networkID}
+			if net.IP != "" {
+				entry["ip"] = net.IP
 			}
 			ipToNetworkList = append(ipToNetworkList, entry)
 		}