fix review comments

kubernetes-sigs · Jun 10, 2022 · acbeed8 · acbeed8
1 parent ce026ad
commit acbeed8
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 8 deletions.
diff --git a/controllers/alias.go b/controllers/alias.go
@@ -43,8 +43,6 @@ type ClusterReconciler struct {
 	Client    client.Client
 	APIReader client.Reader
 
-	RuntimeClient runtimeclient.Client
-
 	// WatchFilterValue is the label value used to filter events prior to reconciliation.
 	WatchFilterValue string
 }
@@ -53,7 +51,6 @@ func (r *ClusterReconciler) SetupWithManager(ctx context.Context, mgr ctrl.Manag
 	return (&clustercontroller.Reconciler{
 		Client:           r.Client,
 		APIReader:        r.APIReader,
-		RuntimeClient:    r.RuntimeClient,
 		WatchFilterValue: r.WatchFilterValue,
 	}).SetupWithManager(ctx, mgr, options)
 }

diff --git a/internal/controllers/cluster/cluster_controller.go b/internal/controllers/cluster/cluster_controller.go
@@ -41,7 +41,6 @@ import (
 	"sigs.k8s.io/cluster-api/controllers/external"
 	expv1 "sigs.k8s.io/cluster-api/exp/api/v1beta1"
 	"sigs.k8s.io/cluster-api/feature"
-	runtimeclient "sigs.k8s.io/cluster-api/internal/runtime/client"
 	"sigs.k8s.io/cluster-api/util"
 	"sigs.k8s.io/cluster-api/util/annotations"
 	"sigs.k8s.io/cluster-api/util/collections"
@@ -68,8 +67,6 @@ type Reconciler struct {
 	Client    client.Client
 	APIReader client.Reader
 
-	RuntimeClient runtimeclient.Client
-
 	// WatchFilterValue is the label value used to filter events prior to reconciliation.
 	WatchFilterValue string
 

diff --git a/internal/controllers/cluster/cluster_controller_test.go b/internal/controllers/cluster/cluster_controller_test.go
@@ -349,6 +349,7 @@ func TestClusterReconciler(t *testing.T) {
 		}, timeout).Should(BeTrue())
 	})
 }
+
 func TestClusterReconcilerNodeRef(t *testing.T) {
 	t.Run("machine to cluster", func(t *testing.T) {
 		cluster := &clusterv1.Cluster{

diff --git a/internal/controllers/topology/cluster/cluster_controller.go b/internal/controllers/topology/cluster/cluster_controller.go
@@ -212,7 +212,7 @@ func (r *Reconciler) reconcile(ctx context.Context, s *scope.Scope) (ctrl.Result
 	if feature.Gates.Enabled(feature.RuntimeSDK) {
 		res, err := r.callBeforeClusterCreateHook(ctx, s)
 		if err != nil {
-			return reconcile.Result{}, errors.Wrap(err, "error calling BeforeClusterCreate hook")
+			return reconcile.Result{}, err
 		}
 		if !res.IsZero() {
 			return res, nil

diff --git a/main.go b/main.go
@@ -382,7 +382,6 @@ func setupReconcilers(ctx context.Context, mgr ctrl.Manager) {
 	if err := (&controllers.ClusterReconciler{
 		Client:           mgr.GetClient(),
 		APIReader:        mgr.GetAPIReader(),
-		RuntimeClient:    runtimeClient,
 		WatchFilterValue: watchFilterValue,
 	}).SetupWithManager(ctx, mgr, concurrency(clusterConcurrency)); err != nil {
 		setupLog.Error(err, "unable to create controller", "controller", "Cluster")