Merge pull request #129 from rejoshed/fixup/affinity-group-deletion

GetZonesAndRequeueIfMissing method added to fix affinity group deletion

Author: k8s-ci-robot

controllers/cloudstackmachine_controller.go

@@ -90,7 +90,7 @@ func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, re
 
 func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
 	return r.RunReconciliationStages(
-		r.GetZones(r.Zones),
+		r.GetZonesAndRequeueIfMissing(r.Zones),
 		r.GetParent(r.ReconciliationSubject, r.CAPIMachine),
 		r.RequeueIfCloudStackClusterNotReady,
 		r.ConsiderAffinity,

controllers/utils/zones.go

@@ -63,7 +63,7 @@ func (r *ReconciliationRunner) CreateZones(zoneSpecs []infrav1.Zone) CloudStackR
 	}
 }
 
-// GetZones gets CloudStackZones owned by a CloudStackCluster via an ownership label.
+// GetZones gets CloudStackZones owned by a CloudStackCluster.
 func (r *ReconciliationRunner) GetZones(zones *infrav1.CloudStackZoneList) CloudStackReconcilerMethod {
 	return func() (ctrl.Result, error) {
 		capiClusterLabel := map[string]string{
@@ -75,6 +75,16 @@ func (r *ReconciliationRunner) GetZones(zones *infrav1.CloudStackZoneList) Cloud
 			client.MatchingLabels(capiClusterLabel),
 		); err != nil {
 			return ctrl.Result{}, errors.Wrap(err, "failed to list zones")
+		}
+		return ctrl.Result{}, nil
+	}
+}
+
+// GetZonesAndRequeueIfMissing gets CloudStackZones owned by a CloudStackCluster and requeues if none are found.
+func (r *ReconciliationRunner) GetZonesAndRequeueIfMissing(zones *infrav1.CloudStackZoneList) CloudStackReconcilerMethod {
+	return func() (ctrl.Result, error) {
+		if res, err := r.GetZones(zones)(); r.ShouldReturn(res, err) {
+			return res, err
 		} else if len(zones.Items) < 1 {
 			return r.RequeueWithMessage("no zones found, requeueing")
 		}