Added ability to specify zone on machine.

Author: Joshua Reed

api/v1beta1/cloudstackmachine_types.go

@@ -63,6 +63,12 @@ type CloudStackMachineSpec struct {
 	// +optional
 	ProviderID *string `json:"providerID,omitempty"`
 
+	// Optionally settable Zone ID to land the machine in.
+	ZoneID string `json:"zoneID,omitempty"`
+
+	// Optionally settable Zone Name to land the machine in.
+	ZoneName string `json:"zoneName,omitempty"`
+
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	// +optional
 	// +k8s:conversion-gen=false

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

@@ -109,6 +109,12 @@ spec:
               template:
                 description: CloudStack template to use.
                 type: string
+              zoneID:
+                description: Optionally settable Zone ID to land the machine in.
+                type: string
+              zoneName:
+                description: Optionally settable Zone Name to land the machine in.
+                type: string
             required:
             - offering
             - template

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

@@ -97,6 +97,14 @@ spec:
                       template:
                         description: CloudStack template to use.
                         type: string
+                      zoneID:
+                        description: Optionally settable Zone ID to land the machine
+                          in.
+                        type: string
+                      zoneName:
+                        description: Optionally settable Zone Name to land the machine
+                          in.
+                        type: string
                     required:
                     - offering
                     - template

controllers/cloudstackmachine_controller.go

@@ -166,15 +166,29 @@ func (r *CloudStackMachineReconciler) reconcile(
 	// Set ZoneID on csMachine.
 	if util.IsControlPlaneMachine(capiMachine) { // Use failure domain zone.
 		csMachine.Status.ZoneID = *capiMachine.Spec.FailureDomain
-	} else { // Random zone.
-		zones := make([]string, len(csCluster.Status.Zones))
-		zidx := 0
-		for zoneID := range csCluster.Status.Zones {
-			zones[zidx] = zoneID
-			zidx++
+	} else { // Specified by Machine Template or Random zone.
+		if csMachine.Spec.ZoneID != "" {
+			if zone, foundZone := csCluster.Status.Zones[csMachine.Spec.ZoneID]; foundZone { // ZoneID Specified.
+				csMachine.Status.ZoneID = zone.ID
+			} else {
+				return ctrl.Result{}, errors.Errorf("could not find zone by zoneID: %s", csMachine.Spec.ZoneID)
+			}
+		} else if csMachine.Spec.ZoneName != "" {
+			if zone := csCluster.Status.Zones.GetByName(csMachine.Spec.ZoneID); zone != nil { // ZoneName Specified.
+				csMachine.Status.ZoneID = zone.ID
+			} else {
+				return ctrl.Result{}, errors.Errorf("could not find zone by zoneName: %s", csMachine.Spec.ZoneName)
+			}
+		} else { // No Zone Specified, pick a Random Zone.
+			zones := make([]string, len(csCluster.Status.Zones))
+			zidx := 0
+			for zoneID := range csCluster.Status.Zones {
+				zones[zidx] = zoneID
+				zidx++
+			}
+			randNum := (rand.Int() % len(csCluster.Spec.Zones)) // #nosec G404 -- weak crypt rand doesn't matter here.
+			csMachine.Status.ZoneID = zones[randNum]
 		}
-		randNum := (rand.Int() % len(csCluster.Spec.Zones)) // #nosec G404 -- weak crypt rand doesn't matter here.
-		csMachine.Status.ZoneID = zones[randNum]
 	}
 
 	secret := &corev1.Secret{}