Wait for cluster readiness.

Joshua Reed · Joshua Reed · commit d53c54909b4a · 2022-03-10T14:47:16.000-08:00
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -137,9 +137,14 @@ func (r *CloudStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re
 		}
 	}
 
+	if !csCluster.Status.Ready {
+		log.Info("CloudStackCluster not ready. Requeuing.")
+		return ctrl.Result{RequeueAfter: requeueTimeout}, nil
+	}
+
 	if util.IsControlPlaneMachine(capiMachine) &&
 		(capiMachine.Spec.FailureDomain == nil || *capiMachine.Spec.FailureDomain == "") {
-		log.Info("CloudStackCluster ZoneID not initialized. Likely not ready.")
+		log.Info("CAPI zone placement specification not yet set. Requeuing.")
 		return ctrl.Result{RequeueAfter: requeueTimeout}, nil
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -137,9 +137,14 @@ func (r *CloudStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Re`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`
	`140`	`+ if !csCluster.Status.Ready {`
	`141`	`+ log.Info("CloudStackCluster not ready. Requeuing.")`
	`142`	`+ return ctrl.Result{RequeueAfter: requeueTimeout}, nil`
	`143`	`+ }`
	`144`	`+`
`140`	`145`	`if util.IsControlPlaneMachine(capiMachine) &&`
`141`	`146`	`(capiMachine.Spec.FailureDomain == nil \|\| *capiMachine.Spec.FailureDomain == "") {`
`142`		`- log.Info("CloudStackCluster ZoneID not initialized. Likely not ready.")`
	`147`	`+ log.Info("CAPI zone placement specification not yet set. Requeuing.")`
`143`	`148`	`return ctrl.Result{RequeueAfter: requeueTimeout}, nil`
`144`	`149`	`}`
`145`	`150`