controller: apply/delete/get components

Author: weizhouapache

apis/v1/types.go

@@ -81,10 +81,13 @@ type ComponentSpec struct {
 
 // ComponentOverrides allows limited, safe overrides to a reused VM spec
 type ComponentOverrides struct {
-	UserDataRefs   []string `json:"userDataRefs,omitempty" yaml:"userDataRefs,omitempty" gorm:"serializer:json"`
-	SSHKeys        []string `json:"sshKeys,omitempty" yaml:"sshKeys,omitempty" gorm:"serializer:json"`
-	SecurityGroups []string `json:"securityGroups,omitempty" yaml:"securityGroups,omitempty" gorm:"serializer:json"`
-	AffinityGroups []string `json:"affinityGroups,omitempty" yaml:"affinityGroups,omitempty" gorm:"serializer:json"`
+	Template        string       `json:"template,omitempty" yaml:"template,omitempty"`
+	ServiceOffering string       `json:"serviceOffering,omitempty" yaml:"serviceOffering,omitempty"`
+	Volumes         []VolumeSpec `json:"volumes,omitempty" yaml:"volumes,omitempty" gorm:"serializer:json"`
+	UserDataRefs    []string     `json:"userDataRefs,omitempty" yaml:"userDataRefs,omitempty" gorm:"serializer:json"`
+	SSHKeys         []string     `json:"sshKeys,omitempty" yaml:"sshKeys,omitempty" gorm:"serializer:json"`
+	SecurityGroups  []string     `json:"securityGroups,omitempty" yaml:"securityGroups,omitempty" gorm:"serializer:json"`
+	AffinityGroups  []string     `json:"affinityGroups,omitempty" yaml:"affinityGroups,omitempty" gorm:"serializer:json"`
 }
 
 // VirtualMachine represents an individual VM instance in CloudStack

controller/controller.go

@@ -714,7 +714,22 @@ func (c *Controller) applyComponent(comp *v1.Component) error {
 		comp.Status.Ready = false
 		comp.Status.LastChecked = time.Now()
 	}
-	// Persist desired component with effective spec (if present)
+	// Resolve base VM spec (by reference or inline) and compute effective spec
+	var base v1.VirtualMachineSpec
+	if comp.Spec.VirtualMachineSpec != "" {
+		var vsr v1.VirtualMachineSpecResource
+		if err := db.DB.Where("name = ?", comp.Spec.VirtualMachineSpec).First(&vsr).Error; err == nil {
+			base = vsr.Spec
+		}
+	} else {
+		// if no referenced spec, allow inline EffectiveSpec to be used as base
+		base = comp.EffectiveSpec
+	}
+
+	effective := mergeVMSpec(base, comp.Spec.Overrides)
+	comp.EffectiveSpec = effective
+
+	// Persist desired component with effective spec
 	return db.DB.Save(comp).Error
 }
 

controller/reconcile.go

@@ -470,5 +470,18 @@ func mergeVMSpec(base v1.VirtualMachineSpec, ov v1.ComponentOverrides) v1.Virtua
 		}
 	}
 
+	// Override template and service offering if provided
+	if ov.Template != "" {
+		out.Template = ov.Template
+	}
+	if ov.ServiceOffering != "" {
+		out.ServiceOffering = ov.ServiceOffering
+	}
+
+	// Override volumes if provided (replace)
+	if len(ov.Volumes) > 0 {
+		out.Volumes = ov.Volumes
+	}
+
 	return out
 }

examples/cluster/component-advanced.yaml

@@ -3,8 +3,12 @@ kind: Component
 metadata:
   name: backend
 spec:
-  vmSpec:
-    name: backend-vmspec
-  template: my-template
-  serviceOffering: small
-  count: 2
+  virtualMachineSpec: backend-vmspec
+  replicas: 2
+  overrides:
+    template: my-template
+    serviceOffering: small
+  healthChecks:
+    - type: ping
+      interval: 10s
+      timeout: 5s

examples/cluster/component-backend.yaml

@@ -3,8 +3,12 @@ kind: Component
 metadata:
   name: frontend
 spec:
-  vmSpec:
-    name: frontend-vmspec
-  template: my-template
-  serviceOffering: small
-  count: 2
+  virtualMachineSpec: frontend-vmspec
+  replicas: 2
+  overrides:
+    template: my-template
+    serviceOffering: small
+  healthChecks:
+    - type: ping
+      interval: 10s
+      timeout: 5s

examples/cluster/component-frontend.yaml

@@ -175,12 +175,13 @@ func PrintVMsFromDB(vms []v1.VirtualMachine) {
 // PrintComponents prints components returned by the controller DB query.
 func PrintComponents(comps []v1.Component) {
 	w := tabwriter.NewWriter(os.Stdout, 0, 0, 2, ' ', 0)
-	fmt.Fprintln(w, "NAME\tREPLICAS\tVM SPEC\tOBSERVED REPLICAS")
+	fmt.Fprintln(w, "NAME\tREPLICAS\tVM SPEC\tSTATE\tOBSERVED REPLICAS")
 	for _, c := range comps {
 		replicas := c.Spec.Replicas
 		vmSpec := c.Spec.VirtualMachineSpec
 		observed := c.ObservedReplicas
-		fmt.Fprintf(w, "%s\t%d\t%s\t%d\n", c.Metadata.Name, replicas, vmSpec, observed)
+		state := c.Status.ObservedState
+		fmt.Fprintf(w, "%s\t%d\t%s\t%s\t%d\n", c.Metadata.Name, replicas, vmSpec, state, observed)
 	}
 	w.Flush()
 }