Merge pull request #126 from rejoshed/fixup/requeue-if-no-zones

Fixup for Zones Panic

Author: k8s-ci-robot

controllers/cloudstackmachine_controller.go

@@ -148,6 +148,10 @@ func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (r
 				return ctrl.Result{}, errors.Errorf("could not find zone by zoneName: %s", r.ReconciliationSubject.Spec.ZoneName)
 			}
 		} else { // No Zone Specified, pick a Random Zone.
+			// TODO: Add an additional controller test for this once controller test upgrades are merged.
+			if len(r.Zones.Items) < 1 { // Double check that zones are present.
+				return r.RequeueWithMessage("no zones found, requeueing")
+			}
 			randNum := (rand.Int() % len(r.Zones.Items)) // #nosec G404 -- weak crypt rand doesn't matter here.
 			r.ReconciliationSubject.Status.ZoneID = r.Zones.Items[randNum].Spec.ID
 		}

controllers/utils/zones.go

@@ -75,6 +75,8 @@ func (r *ReconciliationRunner) GetZones(zones *infrav1.CloudStackZoneList) Cloud
 			client.MatchingLabels(capiClusterLabel),
 		); err != nil {
 			return ctrl.Result{}, errors.Wrap(err, "failed to list zones")
+		} else if len(zones.Items) < 1 {
+			return r.RequeueWithMessage("no zones found, requeueing")
 		}
 		return ctrl.Result{}, nil
 	}