Fix race condition causing invalid CS API calls when zone id is not resolved yet

hrak · hrak · commit de103c56272e · 2023-08-30T17:13:18.000+02:00
Signed-off-by: Hans Rakers &lt;h.rakers@global.leaseweb.com&gt;
diff --git a/controllers/cloudstackisolatednetwork_controller.go b/controllers/cloudstackisolatednetwork_controller.go
@@ -75,6 +75,9 @@ func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result,
 	if err != nil {
 		return r.ReturnWrappedError(retErr, "setting up CloudStackCluster patcher")
 	}
+	if r.FailureDomain.Spec.Zone.ID == "" {
+		return r.RequeueWithMessage("Zone ID not resolved yet.")
+	}
 	if err := r.CSUser.GetOrCreateIsolatedNetwork(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {
 		return ctrl.Result{}, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,9 @@ func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result,`
`75`	`75`	`if err != nil {`
`76`	`76`	`return r.ReturnWrappedError(retErr, "setting up CloudStackCluster patcher")`
`77`	`77`	`}`
	`78`	`+ if r.FailureDomain.Spec.Zone.ID == "" {`
	`79`	`+ return r.RequeueWithMessage("Zone ID not resolved yet.")`
	`80`	`+ }`
`78`	`81`	`if err := r.CSUser.GetOrCreateIsolatedNetwork(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {`
`79`	`82`	`return ctrl.Result{}, err`
`80`	`83`	`}`