Machine state checker and machines work now.

Author: Joshua Reed

api/v1beta2/cloudstackmachine_types.go

@@ -80,7 +80,8 @@ type CloudStackMachineSpec struct {
 	ProviderID *string `json:"providerID,omitempty"`
 
 	// FailureDomain -- the FailureDomain the machine is placed in.
-	FailureDomain CloudStackFailureDomainSpec `json:"failureDomain"`
+	// +optional
+	FailureDomain CloudStackFailureDomainSpec `json:"failureDomain,omitempty"`
 
 	// IdentityRef is a reference to a identity to be used when reconciling this cluster
 	// +optional

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

@@ -494,7 +494,6 @@ spec:
                     type: string
                 type: object
             required:
-            - failureDomain
             - offering
             - template
             type: object

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

@@ -449,7 +449,6 @@ spec:
                             type: string
                         type: object
                     required:
-                    - failureDomain
                     - offering
                     - template
                     type: object

controllers/cloudstackaffinitygroup_controller.go

@@ -49,7 +49,7 @@ func NewCSAGReconciliationRunner() *CloudStackAGReconciliationRunner {
 	// Set concrete type and init pointers.
 	r := &CloudStackAGReconciliationRunner{ReconciliationSubject: &infrav1.CloudStackAffinityGroup{}}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject, "CloudStackAffinityGroup")
 	return r
 }
 

controllers/cloudstackcluster_controller.go

@@ -66,7 +66,7 @@ func NewCSClusterReconciliationRunner() *CloudStackClusterReconciliationRunner {
 	r := &CloudStackClusterReconciliationRunner{ReconciliationSubject: &infrav1.CloudStackCluster{}}
 	r.FailureDomains = &infrav1.CloudStackFailureDomainList{}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject, "CloudStackCluster")
 	// For the CloudStackCluster, the ReconciliationSubject is the CSCluster
 	// Have to do after or the setup method will overwrite the link.
 	r.CSCluster = r.ReconciliationSubject

controllers/cloudstackfailuredomain_controller.go

@@ -42,14 +42,16 @@ type CloudStackFailureDomainReconciler struct {
 type CloudStackFailureDomainReconciliationRunner struct {
 	csCtrlrUtils.ReconciliationRunner
 	ReconciliationSubject *infrav1.CloudStackFailureDomain
+	IsoNet                *infrav1.CloudStackIsolatedNetwork
 }
 
 // Initialize a new CloudStackFailureDomain reconciliation runner with concrete types and initialized member fields.
 func NewCSFailureDomainReconciliationRunner() *CloudStackFailureDomainReconciliationRunner {
 	// Set concrete type and init pointers.
 	r := &CloudStackFailureDomainReconciliationRunner{ReconciliationSubject: &infrav1.CloudStackFailureDomain{}}
+	r.IsoNet = &infrav1.CloudStackIsolatedNetwork{}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject, "CloudStackFailureDomain")
 
 	return r
 }
@@ -65,7 +67,7 @@ func (reconciler *CloudStackFailureDomainReconciler) Reconcile(ctx context.Conte
 
 // Reconcile on the ReconciliationRunner actually attempts to modify or create the reconciliation subject.
 func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {
-	res, err := r.AsFailureDomainUser(r.ReconciliationSubject.Spec)()
+	res, err := r.AsFailureDomainUser(&r.ReconciliationSubject.Spec)()
 	if r.ShouldReturn(res, err) {
 		return res, err
 	}
@@ -81,31 +83,43 @@ func (r *CloudStackFailureDomainReconciliationRunner) Reconcile() (retRes ctrl.R
 		return ctrl.Result{}, errors.Wrap(err, "resolving Cloudstack network information")
 	}
 
-	// TODO: Address Isolated Networks.
-	// // Check if the passed network was an isolated network or the network was missing. In either case, create a
-	// // CloudStackIsolatedNetwork to manage the many intricacies and wait until CloudStackIsolatedNetwork is ready.
-	// if r.ReconciliationSubject.Spec.Network.ID == "" || r.ReconciliationSubject.Spec.Network.Type == infrav1.NetworkTypeIsolated {
-	// 	netName := r.ReconciliationSubject.Spec.Network.Name
-	// 	if res, err := r.GenerateIsolatedNetwork(netName)(); r.ShouldReturn(res, err) {
-	// 		return res, err
-	// 	} else if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
-	// 		return res, err
-	// 	}
-	// 	if r.IsoNet.Name == "" {
-	// 		return r.RequeueWithMessage("Couldn't find isolated network.")
-	// 	}
-	// 	if !r.IsoNet.Status.Ready {
-	// 		return r.RequeueWithMessage("Isolated network dependency not ready.")
-	// 	}
-	// }
+	// Check if the passed network was an isolated network or the network was missing. In either case, create a
+	// CloudStackIsolatedNetwork to manage the many intricacies and wait until CloudStackIsolatedNetwork is ready.
+	if r.ReconciliationSubject.Spec.Zone.Network.ID == "" ||
+		r.ReconciliationSubject.Spec.Zone.Network.Type == infrav1.NetworkTypeIsolated {
+		netName := r.ReconciliationSubject.Spec.Zone.Network.Name
+		if res, err := r.GenerateIsolatedNetwork(netName)(); r.ShouldReturn(res, err) {
+			return res, err
+		} else if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
+			return res, err
+		}
+		if r.IsoNet.Name == "" {
+			return r.RequeueWithMessage("Couldn't find isolated network.")
+		}
+		if !r.IsoNet.Status.Ready {
+			return r.RequeueWithMessage("Isolated network dependency not ready.")
+		}
+	}
 	r.ReconciliationSubject.Status.Ready = true
 	return ctrl.Result{}, nil
 }
 
 // ReconcileDelete on the ReconciliationRunner actually attempts to delete the reconciliation subject.
 func (r *CloudStackFailureDomainReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, retErr error) {
-	// TODO: Consider owned resources.
-	// Allow deletion.
+	r.Log.Info("Deleting CloudStackZone")
+	// Address Isolated Networks.
+	if r.ReconciliationSubject.Spec.Zone.Network.Type == infrav1.NetworkTypeIsolated {
+		netName := r.ReconciliationSubject.Spec.Zone.Network.Name
+		if res, err := r.GetObjectByName(r.IsoNetMetaName(netName), r.IsoNet)(); r.ShouldReturn(res, err) {
+			return res, err
+		}
+		if r.IsoNet.Name != "" {
+			if err := r.K8sClient.Delete(r.RequestCtx, r.IsoNet); err != nil {
+				return ctrl.Result{}, err
+			}
+			return r.RequeueWithMessage("Child IsolatedNetwork still present, requeueing.")
+		}
+	}
 	controllerutil.RemoveFinalizer(r.ReconciliationSubject, infrav1.FailureDomainFinalizer)
 	return ctrl.Result{}, nil
 }

controllers/cloudstackisolatednetwork_controller.go

@@ -42,17 +42,17 @@ type CloudStackIsoNetReconciler struct {
 // CloudStackZoneReconciliationRunner is a ReconciliationRunner with extensions specific to CloudStack isolated network reconciliation.
 type CloudStackIsoNetReconciliationRunner struct {
 	csCtrlrUtils.ReconciliationRunner
-	Zone                  *infrav1.CloudStackZone
+	FailureDomain         *infrav1.CloudStackFailureDomain
 	ReconciliationSubject *infrav1.CloudStackIsolatedNetwork
 }
 
 // Initialize a new CloudStackIsoNet reconciliation runner with concrete types and initialized member fields.
 func NewCSIsoNetReconciliationRunner() *CloudStackIsoNetReconciliationRunner {
 	// Set concrete type and init pointers.
 	r := &CloudStackIsoNetReconciliationRunner{ReconciliationSubject: &infrav1.CloudStackIsolatedNetwork{}}
-	r.Zone = &infrav1.CloudStackZone{}
+	r.FailureDomain = &infrav1.CloudStackFailureDomain{}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject, "CloudStackIsolatedNetwork")
 	return r
 }
 
@@ -65,10 +65,17 @@ func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req
 }
 
 func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {
-	if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {
+	if res, err := r.GetParent(r.ReconciliationSubject, r.FailureDomain)(); r.ShouldReturn(res, err) {
 		return res, err
 	}
-	if res, err := r.GetParent(r.ReconciliationSubject, r.Zone)(); r.ShouldReturn(res, err) {
+	if r.FailureDomain.Spec.Name == "" {
+		return ctrl.Result{}, errors.New("couldn't get parent Failure Domain for placement")
+	}
+	res, err := r.AsFailureDomainUser(&r.FailureDomain.Spec)()
+	if r.ShouldReturn(res, err) {
+		return res, err
+	}
+	if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {
 		return res, err
 	}
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.IsolatedNetworkFinalizer)
@@ -79,7 +86,7 @@ func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result,
 	if err != nil {
 		return r.ReturnWrappedError(retErr, "setting up CloudStackCluster patcher")
 	}
-	if err := r.CSUser.GetOrCreateIsolatedNetwork(r.Zone, r.ReconciliationSubject, r.CSCluster); err != nil {
+	if err := r.CSUser.GetOrCreateIsolatedNetwork(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {
 		return ctrl.Result{}, err
 	}
 	// Tag the created network.
@@ -95,8 +102,18 @@ func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result,
 }
 
 func (r *CloudStackIsoNetReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, retErr error) {
+	if res, err := r.GetParent(r.ReconciliationSubject, r.FailureDomain)(); r.ShouldReturn(res, err) {
+		return res, err
+	}
+	if r.FailureDomain.Spec.Name == "" {
+		return ctrl.Result{}, errors.New("couldn't get parent Failure Domain for placement")
+	}
+	res, err := r.AsFailureDomainUser(&r.FailureDomain.Spec)()
+	if r.ShouldReturn(res, err) {
+		return res, err
+	}
 	r.Log.Info("Deleting IsolatedNetwork.")
-	if err := r.CSUser.DisposeIsoNetResources(r.Zone, r.ReconciliationSubject, r.CSCluster); err != nil {
+	if err := r.CSUser.DisposeIsoNetResources(r.FailureDomain, r.ReconciliationSubject, r.CSCluster); err != nil {
 		if !strings.Contains(strings.ToLower(err.Error()), "no match found") {
 			return ctrl.Result{}, err
 		}

controllers/cloudstackmachine_controller.go

@@ -19,14 +19,15 @@ package controllers
 import (
 	"context"
 	"fmt"
+	"math/rand"
 	"reflect"
 
-
 	"github.com/pkg/errors"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/types"
 	"sigs.k8s.io/cluster-api/util"
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	"sigs.k8s.io/controller-runtime/pkg/handler"
@@ -74,7 +75,7 @@ func NewCSMachineReconciliationRunner() *CloudStackMachineReconciliationRunner {
 	r.AffinityGroup = &infrav1.CloudStackAffinityGroup{}
 	r.FailureDomain = &infrav1.CloudStackFailureDomain{}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = utils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = utils.NewRunner(r, r.ReconciliationSubject, "CloudStackMachine")
 	return r
 }
 
@@ -90,13 +91,18 @@ func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, re
 
 func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
 	return r.RunReconciliationStages(
-		r.AsFailureDomainUser(r.ReconciliationSubject.Spec.FailureDomain),
-		r.GetZonesAndRequeueIfMissing(r.Zones),
 		r.GetParent(r.ReconciliationSubject, r.CAPIMachine),
 		r.RequeueIfCloudStackClusterNotReady,
-		r.ConsiderAffinity,
 		r.SetFailureDomainOnCSMachine,
-		r.GetObjectByName("placeholder", r.IsoNet, func() string { return r.IsoNetMetaName(r.FailureDomain.Spec.Zone.Network.Name) }),
+		r.GetObjectByName("placeholder", r.FailureDomain,
+			func() string { return r.ReconciliationSubject.Spec.FailureDomain.Name }),
+		r.CheckPresent(map[string]client.Object{"CloudStackFailureDomain": r.FailureDomain}),
+		r.AsFailureDomainUser(&r.FailureDomain.Spec),
+		r.GetObjectByName("placeholder", r.IsoNet,
+			func() string { return r.IsoNetMetaName(r.FailureDomain.Spec.Zone.Network.Name) }),
+		r.RunIf(func() bool { return r.FailureDomain.Spec.Zone.Network.Type == cloud.NetworkTypeIsolated },
+			r.CheckPresent(map[string]client.Object{"CloudStackIsolatedNetwork": r.IsoNet})),
+		r.ConsiderAffinity,
 		r.GetOrCreateVMInstance,
 		r.RequeueIfInstanceNotRunning,
 		r.AddToLBIfNeeded,
@@ -128,40 +134,14 @@ func (r *CloudStackMachineReconciliationRunner) ConsiderAffinity() (ctrl.Result,
 
 // SetFailureDomainOnCSMachine sets the failure domain the machine should launch in.
 func (r *CloudStackMachineReconciliationRunner) SetFailureDomainOnCSMachine() (retRes ctrl.Result, reterr error) {
-	// // Set ZoneID on csMachine.
-	// if util.IsControlPlaneMachine(r.CAPIMachine) { // Use failure domain zone.
-	// 	r.ReconciliationSubject.Status.ZoneID = *r.CAPIMachine.Spec.FailureDomain
-	// } else { // Specified by Machine Template or Random zone.
-	// 	if r.ReconciliationSubject.Spec.FailureDomain.Name != "" {
-	// 		if zone, foundZone := r.CSCluster.Status.Zones[r.ReconciliationSubject.Spec.ZoneID]; foundZone { // ZoneID Specified.
-	// 			r.ReconciliationSubject.Status.ZoneID = zone.ID
-	// 		} else {
-	// 			return ctrl.Result{}, errors.Errorf("could not find zone by zoneID: %s", r.ReconciliationSubject.Spec.ZoneID)
-	// 		}
-	// 	} else if r.ReconciliationSubject.Spec.ZoneName != "" {
-	// 		for _, zone := range r.Zones.Items {
-	// 			if zone.Spec.Name == r.ReconciliationSubject.Spec.ZoneName {
-	// 				r.ReconciliationSubject.Status.ZoneID = zone.Spec.ID
-	// 				break
-	// 			}
-	// 		}
-	// 		if r.ReconciliationSubject.Status.ZoneID == "" {
-	// 			return ctrl.Result{}, errors.Errorf("could not find zone by zoneName: %s", r.ReconciliationSubject.Spec.ZoneName)
-	// 		}
-	// 	} else { // No Zone Specified, pick a Random Zone.
-	// 		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
-	// 	}
-	// }
-	// for idx, zone := range r.Zones.Items {
-	// 	if zone.Spec.ID == r.ReconciliationSubject.Status.ZoneID {
-	// 		r.FailureDomain = &r.Zones.Items[idx]
-	// 		break
-	// 	}
-	// }
+	if r.ReconciliationSubject.Spec.FailureDomain.Name == "" { // Needs random FD, but not yet set.
+		if util.IsControlPlaneMachine(r.CAPIMachine) { // Is control plane machine -- CAPI will specify.
+			r.ReconciliationSubject.Spec.FailureDomain.Name = *r.CAPIMachine.Spec.FailureDomain
+		} else { // Not a control plane machine. Place randomly.
+			randNum := (rand.Int() % len(r.CSCluster.Spec.FailureDomains)) // #nosec G404 -- weak crypt rand doesn't matter here.
+			r.ReconciliationSubject.Spec.FailureDomain.Name = r.CSCluster.Spec.FailureDomains[randNum].Name
+		}
+	}
 	return ctrl.Result{}, nil
 }
 
@@ -173,15 +153,6 @@ func (r *CloudStackMachineReconciliationRunner) GetOrCreateVMInstance() (retRes
 	}
 	r.Log.Info("Got Bootstrap DataSecretName.")
 
-	// Get the CloudStackZone for the Machine.
-	var machineZone infrav1.CloudStackZone
-	for _, zone := range r.Zones.Items {
-		machineZone = zone
-		if zone.Spec.ID == r.ReconciliationSubject.Status.ZoneID {
-			break
-		}
-	}
-
 	// Get the kubeadm bootstrap secret for this machine.
 	secret := &corev1.Secret{}
 	key := types.NamespacedName{Namespace: r.CAPIMachine.Namespace, Name: *r.CAPIMachine.Spec.Bootstrap.DataSecretName}
@@ -193,7 +164,7 @@ func (r *CloudStackMachineReconciliationRunner) GetOrCreateVMInstance() (retRes
 		return ctrl.Result{}, errors.New("bootstrap secret data not yet set")
 	}
 
-	err := r.CSUser.GetOrCreateVMInstance(r.ReconciliationSubject, r.CAPIMachine, r.CSCluster, &machineZone, r.AffinityGroup, string(data))
+	err := r.CSUser.GetOrCreateVMInstance(r.ReconciliationSubject, r.CAPIMachine, r.CSCluster, r.FailureDomain, r.AffinityGroup, string(data))
 
 	if err == nil && !controllerutil.ContainsFinalizer(r.ReconciliationSubject, infrav1.MachineFinalizer) { // Fetched or Created?
 		r.Log.Info("CloudStack instance Created", "instanceStatus", r.ReconciliationSubject.Status)
@@ -253,7 +224,7 @@ func (r *CloudStackMachineReconciliationRunner) GetOrCreateMachineStateChecker()
 }
 
 func (r *CloudStackMachineReconciliationRunner) ReconcileDelete() (retRes ctrl.Result, reterr error) {
-	if res, err := r.AsFailureDomainUser(r.ReconciliationSubject.Spec.FailureDomain)(); r.ShouldReturn(res, err) {
+	if res, err := r.AsFailureDomainUser(&r.ReconciliationSubject.Spec.FailureDomain)(); r.ShouldReturn(res, err) {
 		return res, err
 	}
 	if r.ReconciliationSubject.Spec.InstanceID != nil {

controllers/cloudstackmachinestatechecker_controller.go

@@ -22,6 +22,7 @@ import (
 	"time"
 
 	ctrl "sigs.k8s.io/controller-runtime"
+	"sigs.k8s.io/controller-runtime/pkg/client"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
 	csCtrlrUtils "sigs.k8s.io/cluster-api-provider-cloudstack/controllers/utils"
@@ -38,6 +39,7 @@ type CloudStackMachineStateCheckerReconciliationRunner struct {
 	csCtrlrUtils.ReconciliationRunner
 	MachineStateCheckers  *infrav1.CloudStackMachineStateCheckerList
 	ReconciliationSubject *infrav1.CloudStackMachineStateChecker
+	FailureDomain         *infrav1.CloudStackFailureDomain
 	CAPIMachine           *clusterv1.Machine
 	CSMachine             *infrav1.CloudStackMachine
 }
@@ -53,8 +55,9 @@ func NewCSMachineStateCheckerReconciliationRunner() *CloudStackMachineStateCheck
 	runner := &CloudStackMachineStateCheckerReconciliationRunner{ReconciliationSubject: &infrav1.CloudStackMachineStateChecker{}}
 	runner.CAPIMachine = &clusterv1.Machine{}
 	runner.CSMachine = &infrav1.CloudStackMachine{}
+	runner.FailureDomain = &infrav1.CloudStackFailureDomain{}
 	// Setup the base runner. Initializes pointers and links reconciliation methods.
-	runner.ReconciliationRunner = csCtrlrUtils.NewRunner(runner, runner.ReconciliationSubject)
+	runner.ReconciliationRunner = csCtrlrUtils.NewRunner(runner, runner.ReconciliationSubject, "CloudStackMachineStateChecker")
 	return runner
 }
 
@@ -67,11 +70,16 @@ func (r *CloudStackMachineStateCheckerReconciler) Reconcile(ctx context.Context,
 }
 
 func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Result, error) {
-	if res, err := r.GetParent(r.ReconciliationSubject, r.CSMachine)(); r.ShouldReturn(res, err) {
-		return res, err
-	}
-
-	if res, err := r.GetParent(r.CSMachine, r.CAPIMachine)(); r.ShouldReturn(res, err) {
+	if res, err := r.RunReconciliationStages(
+		r.GetParent(r.ReconciliationSubject, r.CSMachine),
+		r.GetParent(r.CSMachine, r.CAPIMachine),
+		r.CheckPresent(map[string]client.Object{"CloudStackMachine": r.CSMachine, "Machine": r.CAPIMachine}),
+		r.GetObjectByName(r.CSMachine.Spec.FailureDomain.Name, r.FailureDomain),
+		r.GetObjectByName("placeholder", r.FailureDomain,
+			func() string { return r.CSMachine.Spec.FailureDomain.Name }),
+		r.CheckPresent(map[string]client.Object{"CloudStackFailureDomain": r.FailureDomain}),
+		r.AsFailureDomainUser(&r.FailureDomain.Spec),
+	); r.ShouldReturn(res, err) {
 		return res, err
 	}
 

controllers/cloudstackzone_controller.go

@@ -50,7 +50,7 @@ func NewCSZoneReconciliationRunner() *CloudStackZoneReconciliationRunner {
 	r.Zones = &infrav1.CloudStackZoneList{}
 	r.IsoNet = &infrav1.CloudStackIsolatedNetwork{}
 	// Setup the base r. Initializes pointers and links reconciliation methods.
-	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject)
+	r.ReconciliationRunner = csCtrlrUtils.NewRunner(r, r.ReconciliationSubject, "CloudStackZone")
 	return r
 }