Basic fd controller test runs now.

Joshua Reed · Joshua Reed · commit c73e5b152bfc · 2022-07-06T13:41:44.000-07:00
diff --git a/controllers/cloudstackaffinitygroup_controller.go b/controllers/cloudstackaffinitygroup_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -55,7 +54,6 @@ func NewCSAGReconciliationRunner() *CloudStackAGReconciliationRunner {
 }
 
 func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSAGReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -64,7 +62,6 @@ func (reconciler *CloudStackAffinityGroupReconciler) Reconcile(ctx context.Conte
 }
 
 func (r *CloudStackAGReconciliationRunner) Reconcile() (ctrl.Result, error) {
-	defer ginkgo.GinkgoRecover()
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.AffinityGroupFinalizer)
 	affinityGroup := &cloud.AffinityGroup{Name: r.ReconciliationSubject.Spec.Name, Type: r.ReconciliationSubject.Spec.Type}
 	if err := r.CSUser.GetOrCreateAffinityGroup(affinityGroup); err != nil {
diff --git a/controllers/cloudstackcluster_controller.go b/controllers/cloudstackcluster_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 	"fmt"
 	"reflect"
@@ -77,7 +76,6 @@ func NewCSClusterReconciliationRunner() *CloudStackClusterReconciliationRunner {
 
 // Reconcile is the method k8s will call upon a reconciliation request.
 func (reconciler *CloudStackClusterReconciler) Reconcile(ctx context.Context, req ctrl.Request) (retRes ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSClusterReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -87,7 +85,6 @@ func (reconciler *CloudStackClusterReconciler) Reconcile(ctx context.Context, re
 
 // Reconcile actually reconciles the CloudStackCluster.
 func (r *CloudStackClusterReconciliationRunner) Reconcile() (res ctrl.Result, reterr error) {
-	defer ginkgo.GinkgoRecover()
 	return r.RunReconciliationStages(
 		r.RequeueIfMissingBaseCRs,
 		r.CreateFailureDomains(r.ReconciliationSubject.Spec.FailureDomains),
diff --git a/controllers/cloudstackfailuredomain_controller.go b/controllers/cloudstackfailuredomain_controller.go
@@ -19,8 +19,6 @@ package controllers
 import (
 	"context"
 
-	"github.com/onsi/ginkgo/v2"
-
 	ctrl "sigs.k8s.io/controller-runtime"
 
 	infrav1 "sigs.k8s.io/cluster-api-provider-cloudstack/api/v1beta2"
@@ -56,7 +54,6 @@ func NewCSFailureDomainReconciliationRunner() *CloudStackFailureDomainReconcilia
 
 // Reconcile is the method k8s will call upon a reconciliation request.
 func (reconciler *CloudStackFailureDomainReconciler) Reconcile(ctx context.Context, req ctrl.Request) (retRes ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSFailureDomainReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -66,7 +63,6 @@ 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) {
-	defer ginkgo.GinkgoRecover()
 	r.Log.Info("blah2")
 	r.ReconciliationSubject.Status.Ready = true
 	return ctrl.Result{}, nil
diff --git a/controllers/cloudstackisolatednetwork_controller.go b/controllers/cloudstackisolatednetwork_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 	"strings"
 
@@ -58,7 +57,6 @@ func NewCSIsoNetReconciliationRunner() *CloudStackIsoNetReconciliationRunner {
 }
 
 func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSIsoNetReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -67,7 +65,6 @@ func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req
 }
 
 func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {
 		return res, err
 	}
diff --git a/controllers/cloudstackmachine_controller.go b/controllers/cloudstackmachine_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 	"fmt"
 	"math/rand"
@@ -82,7 +81,6 @@ func NewCSMachineReconciliationRunner() *CloudStackMachineReconciliationRunner {
 // Reconcile is part of the main kubernetes reconciliation loop which aims to
 // move the current state of the cluster closer to the desired state.
 func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSMachineReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -91,7 +89,6 @@ func (reconciler *CloudStackMachineReconciler) Reconcile(ctx context.Context, re
 }
 
 func (r *CloudStackMachineReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
-	defer ginkgo.GinkgoRecover()
 	return r.RunReconciliationStages(
 		r.GetZonesAndRequeueIfMissing(r.Zones),
 		r.GetParent(r.ReconciliationSubject, r.CAPIMachine),
diff --git a/controllers/cloudstackmachinestatechecker_controller.go b/controllers/cloudstackmachinestatechecker_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 	"strings"
 	"time"
@@ -60,7 +59,6 @@ func NewCSMachineStateCheckerReconciliationRunner() *CloudStackMachineStateCheck
 }
 
 func (r *CloudStackMachineStateCheckerReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSMachineStateCheckerReconciliationRunner().
 		UsingBaseReconciler(r.ReconcilerBase).
 		ForRequest(req).
@@ -69,7 +67,6 @@ func (r *CloudStackMachineStateCheckerReconciler) Reconcile(ctx context.Context,
 }
 
 func (r *CloudStackMachineStateCheckerReconciliationRunner) Reconcile() (ctrl.Result, error) {
-	defer ginkgo.GinkgoRecover()
 	if res, err := r.GetParent(r.ReconciliationSubject, r.CSMachine)(); r.ShouldReturn(res, err) {
 		return res, err
 	}
diff --git a/controllers/cloudstackzone_controller.go b/controllers/cloudstackzone_controller.go
@@ -17,7 +17,6 @@ limitations under the License.
 package controllers
 
 import (
-	"github.com/onsi/ginkgo/v2"
 	"context"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -58,7 +57,6 @@ func NewCSZoneReconciliationRunner() *CloudStackZoneReconciliationRunner {
 
 // Reconciler Reconcile adapts the runner to the runner to what k8s expects.
 func (reconciler *CloudStackZoneReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {
-	defer ginkgo.GinkgoRecover()
 	return NewCSZoneReconciliationRunner().
 		UsingBaseReconciler(reconciler.ReconcilerBase).
 		ForRequest(req).
@@ -75,7 +73,6 @@ func (reconciler *CloudStackZoneReconciler) SetupWithManager(mgr ctrl.Manager) e
 
 // Reconcile attempts to move the state of CRs to the requested state.
 func (r *CloudStackZoneReconciliationRunner) Reconcile() (retRes ctrl.Result, reterr error) {
-	defer ginkgo.GinkgoRecover()
 	// Prevent premature deletion.
 	controllerutil.AddFinalizer(r.ReconciliationSubject, infrav1.ZoneFinalizer)
 
diff --git a/main.go b/main.go
@@ -167,13 +167,6 @@ func main() {
 
 	setupReconcilers(base, mgr)
 
-	if err = (&controllers.CloudStackFailureDomainReconciler{
-		Client: mgr.GetClient(),
-		Scheme: mgr.GetScheme(),
-	}).SetupWithManager(mgr); err != nil {
-		setupLog.Error(err, "unable to create controller", "controller", "CloudStackFailureDomain")
-		os.Exit(1)
-	}
 	// +kubebuilder:scaffold:builder
 
 	// Add health and ready checks.
@@ -232,4 +225,8 @@ func setupReconcilers(base utils.ReconcilerBase, mgr manager.Manager) {
 		setupLog.Error(err, "unable to create controller", "controller", "CloudStackAffinityGroup")
 		os.Exit(1)
 	}
+	if err := (&controllers.CloudStackFailureDomainReconciler{ReconcilerBase: base}).SetupWithManager(mgr); err != nil {
+		setupLog.Error(err, "unable to create controller", "controller", "CloudStackFailureDomain")
+		os.Exit(1)
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,6 @@ limitations under the License.`
`17`	`17`	`package controllers`
`18`	`18`
`19`	`19`	`import (`
`20`		`- "github.com/onsi/ginkgo/v2"`
`21`	`20`	`"context"`
`22`	`21`	`"strings"`
`23`	`22`
`@@ -58,7 +57,6 @@ func NewCSIsoNetReconciliationRunner() *CloudStackIsoNetReconciliationRunner {`
`58`	`57`	`}`
`59`	`58`
`60`	`59`	`func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (res ctrl.Result, retErr error) {`
`61`		`- defer ginkgo.GinkgoRecover()`
`62`	`60`	`return NewCSIsoNetReconciliationRunner().`
`63`	`61`	`UsingBaseReconciler(reconciler.ReconcilerBase).`
`64`	`62`	`ForRequest(req).`
`@@ -67,7 +65,6 @@ func (reconciler *CloudStackIsoNetReconciler) Reconcile(ctx context.Context, req`
`67`	`65`	`}`
`68`	`66`
`69`	`67`	`func (r *CloudStackIsoNetReconciliationRunner) Reconcile() (retRes ctrl.Result, retErr error) {`
`70`		`- defer ginkgo.GinkgoRecover()`
`71`	`68`	`if res, err := r.RequeueIfMissingBaseCRs(); r.ShouldReturn(res, err) {`
`72`	`69`	`return res, err`
`73`	`70`	`}`