apis: move networkIDs to networks

Author: weizhouapache

README.md

@@ -104,7 +104,7 @@ Quick reference for the key fields users will commonly set for higher-level reso
 | `metadata.name` | string | Reusable VM spec identifier |
 | `spec.template` | string | Template name or ID |
 | `spec.serviceOffering` | string | Service offering (size) |
-| `spec.networkIds` | list | Network IDs to attach |
+| `spec.networks` | list | Network IDs to attach |
 | `spec.sshKeys` | list | SSH key names to inject |
 | `spec.userDataRefs` | list | Optional references to `UserData` resources |
 ---
@@ -122,7 +122,7 @@ spec:
   zone: zone-1
   template: ubuntu-22.04
   serviceOffering: medium
-  networkIds:
+  networks:
     - existing-network-1-id
   sshKeys:
     - platform-admin
@@ -183,7 +183,7 @@ spec:
   project: project-2
   template: ubuntu-22.04
   serviceOffering: medium
-  networkIds:
+  networks:
     - existing-network-1-id
   sshKeys:
     - platform-admin

apis/v1/types.go

@@ -106,7 +106,7 @@ type VirtualMachineSpec struct {
 	Project         string        `json:"project,omitempty" yaml:"project"`                                            // CloudStack project ID or name
 	Template        string        `json:"template,omitempty" yaml:"template"`                                          // VM template name/ID
 	ServiceOffering string        `json:"serviceOffering,omitempty" yaml:"serviceOffering"`                            // VM service offering (size)
-	NetworkIDs      []string      `json:"networkIds,omitempty" yaml:"networkIds" gorm:"serializer:json"`               // Attached networks
+	Networks        []string      `json:"networks,omitempty" yaml:"networks" gorm:"serializer:json"`                   // Attached networks
 	SSHKeys         []string      `json:"sshKeys,omitempty" yaml:"sshKeys" gorm:"serializer:json"`                     // SSH keys for access
 	SecurityGroups  []string      `json:"securityGroups,omitempty" yaml:"securityGroups" gorm:"serializer:json"`       // Firewall groups
 	AffinityGroups  []string      `json:"affinityGroups,omitempty" yaml:"affinityGroups" gorm:"serializer:json"`       // Host/VM affinity rules

controller/cmd_get.go

@@ -117,7 +117,7 @@ func ListVirtualMachineSpec(name string) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
 	fmt.Fprintln(w, "NAME\tTEMPLATE\tSERVICE_OFFERING\tNETWORKS\tVOLUMES")
 	for _, s := range specs {
-		nets := strings.Join(s.Spec.NetworkIDs, ",")
+		nets := strings.Join(s.Spec.Networks, ",")
 		volCount := 0
 		if len(s.Spec.Volumes) > 0 {
 			volCount = len(s.Spec.Volumes)

controller/controller.go

@@ -1,6 +1,7 @@
 package controller
 
 import (
+	"bytes"
 	v1 "cloudstackctl/apis/v1"
 	"cloudstackctl/db"
 	"cloudstackctl/pkg/handlers"
@@ -97,11 +98,60 @@ func (c *Controller) handleApply(w http.ResponseWriter, r *http.Request) {
 		}
 		applyErr = c.applyApplication(&app)
 	case "Component":
-		var comp v1.Component
-		if err := json.Unmarshal(body, &comp); err != nil {
+		// Accept two forms for Component.spec.virtualMachineSpec:
+		// - a string referencing a named VirtualMachineSpec
+		// - an inline object describing a VirtualMachineSpec
+		type compSpecIn struct {
+			VirtualMachineSpec json.RawMessage       `json:"virtualMachineSpec"`
+			Replicas           int                   `json:"replicas"`
+			Overrides          v1.ComponentOverrides `json:"overrides"`
+			HealthChecks       []v1.HealthCheck      `json:"healthChecks"`
+		}
+		type compIn struct {
+			APIVersion string      `json:"apiVersion"`
+			Kind       string      `json:"kind"`
+			Metadata   v1.Metadata `json:"metadata"`
+			Spec       compSpecIn  `json:"spec"`
+			Status     v1.Status   `json:"status"`
+		}
+
+		var ci compIn
+		if err := json.Unmarshal(body, &ci); err != nil {
 			http.Error(w, "failed to parse Component", http.StatusBadRequest)
 			return
 		}
+
+		comp := v1.Component{
+			APIVersion: ci.APIVersion,
+			Kind:       ci.Kind,
+			Metadata:   ci.Metadata,
+			Spec: v1.ComponentSpec{
+				Replicas:     ci.Spec.Replicas,
+				Overrides:    ci.Spec.Overrides,
+				HealthChecks: ci.Spec.HealthChecks,
+			},
+		}
+
+		// Interpret VirtualMachineSpec field which may be a string or object
+		if len(ci.Spec.VirtualMachineSpec) > 0 {
+			// If it starts with a quote it's a JSON string
+			b := ci.Spec.VirtualMachineSpec
+			// trim whitespace
+			trimmed := bytes.TrimSpace(b)
+			if len(trimmed) > 0 && trimmed[0] == '"' {
+				var ref string
+				if err := json.Unmarshal(b, &ref); err == nil {
+					comp.Spec.VirtualMachineSpec = ref
+				}
+			} else {
+				// Attempt to decode inline VirtualMachineSpec
+				var vms v1.VirtualMachineSpec
+				if err := json.Unmarshal(b, &vms); err == nil {
+					comp.EffectiveSpec = vms
+				}
+			}
+		}
+
 		applyErr = c.applyComponent(&comp)
 	case "VirtualMachine":
 		var vm v1.VirtualMachine
@@ -119,7 +169,7 @@ func (c *Controller) handleApply(w http.ResponseWriter, r *http.Request) {
 
 	if applyErr != nil {
 		log.Printf("apply error for kind=%s: %v", kind, applyErr)
-		http.Error(w, "failed to apply resource", http.StatusInternalServerError)
+		http.Error(w, fmt.Sprintf("failed to apply resource: %v", applyErr), http.StatusInternalServerError)
 		return
 	}
 
@@ -618,11 +668,11 @@ func compareVMSpec(a, b v1.VirtualMachineSpec) bool {
 	if a.Project != b.Project {
 		return false
 	}
-	if len(a.NetworkIDs) != len(b.NetworkIDs) {
+	if len(a.Networks) != len(b.Networks) {
 		return false
 	}
-	for i := range a.NetworkIDs {
-		if a.NetworkIDs[i] != b.NetworkIDs[i] {
+	for i := range a.Networks {
+		if a.Networks[i] != b.Networks[i] {
 			return false
 		}
 	}

controller/reconcile.go

@@ -125,12 +125,12 @@ func (c *Controller) populateObservedSpec(vm *v1.VirtualMachine) error {
 		obs.ServiceOffering = v.Serviceofferingid
 	}
 
-	// NICs -> NetworkIDs
+	// NICs -> Networks
 	if len(v.Nic) > 0 {
-		obs.NetworkIDs = []string{}
+		obs.Networks = []string{}
 		for _, n := range v.Nic {
 			if n.Networkid != "" {
-				obs.NetworkIDs = append(obs.NetworkIDs, n.Networkid)
+				obs.Networks = append(obs.Networks, n.Networkid)
 			}
 		}
 	}

examples/cluster/component-advanced.yaml

@@ -7,7 +7,7 @@ spec:
   virtualMachineSpec:
     template: ubuntu-22.04
     serviceOffering: medium
-    networkIds:
+    networks:
       - existing-network-1-id
     sshKeys:
       - platform-admin

examples/cluster/component-backend.yaml

@@ -0,0 +1,10 @@
+apiVersion: cloudstackctl/v1
+kind: Component
+metadata:
+  name: backend
+spec:
+  vmSpec:
+    name: backend-vmspec
+  template: my-template
+  serviceOffering: small
+  count: 2

examples/cluster/component.yaml examples/cluster/component-frontend.yamlexamples/cluster/component.yaml renamed to examples/cluster/component-frontend.yaml

@@ -0,0 +1,16 @@
+apiVersion: cloudstackctl/v1
+kind: VirtualMachineSpec
+metadata:
+  name: backend-vmspec
+spec:
+  template: my-template
+  serviceOffering: small
+  networks:
+    - example-network
+  sshKeys:
+    - my-key
+  volumes:
+    - name: data-disk
+      type: data
+      diskOffering: standard-hdd
+      size: 50

examples/cluster/virtualmachinespec-backend.yaml

@@ -5,7 +5,7 @@ metadata:
 spec:
   template: my-template
   serviceOffering: small
-  networkIDs:
+  networks:
     - example-network
   sshKeys:
     - my-key