Revert "Use uncached client (kubernetes-sigs#1682)"

This reverts commit aa44df2.
Karthik-K-N · Mar 26, 2024 · 93ae5a4 · 93ae5a4
1 parent e165566
commit 93ae5a4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 15 deletions.
diff --git a/controllers/ibmpowervscluster_controller.go b/controllers/ibmpowervscluster_controller.go
@@ -51,7 +51,6 @@ import (
 // IBMPowerVSClusterReconciler reconciles a IBMPowerVSCluster object.
 type IBMPowerVSClusterReconciler struct {
 	client.Client
-	UncachedClient  client.Client
 	Recorder        record.EventRecorder
 	ServiceEndpoint []endpoints.ServiceEndpoint
 	Scheme          *runtime.Scheme
@@ -66,7 +65,7 @@ func (r *IBMPowerVSClusterReconciler) Reconcile(ctx context.Context, req ctrl.Re
 
 	// Fetch the IBMPowerVSCluster instance.
 	ibmCluster := &infrav1beta2.IBMPowerVSCluster{}
-	err := r.UncachedClient.Get(ctx, req.NamespacedName, ibmCluster)
+	err := r.Get(ctx, req.NamespacedName, ibmCluster)
 	if err != nil {
 		if apierrors.IsNotFound(err) {
 			return ctrl.Result{}, nil

diff --git a/controllers/ibmpowervscluster_controller_test.go b/controllers/ibmpowervscluster_controller_test.go
@@ -79,8 +79,7 @@ func TestIBMPowerVSClusterReconciler_Reconcile(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			g := NewWithT(t)
 			reconciler := &IBMPowerVSClusterReconciler{
-				Client:         testEnv.Client,
-				UncachedClient: testEnv.Client,
+				Client: testEnv.Client,
 			}
 
 			ns, err := testEnv.CreateNamespace(ctx, fmt.Sprintf("namespace-%s", util.RandomString(5)))
@@ -158,8 +157,7 @@ func TestIBMPowerVSClusterReconciler_reconcile(t *testing.T) {
 		t.Run(tc.name, func(t *testing.T) {
 			g := NewWithT(t)
 			reconciler := &IBMPowerVSClusterReconciler{
-				Client:         testEnv.Client,
-				UncachedClient: testEnv.Client,
+				Client: testEnv.Client,
 			}
 			_, _ = reconciler.reconcile(tc.powervsClusterScope)
 			g.Expect(tc.powervsClusterScope.IBMPowerVSCluster.Status.Ready).To(Equal(tc.clusterStatus))
@@ -174,8 +172,7 @@ func TestIBMPowerVSClusterReconciler_delete(t *testing.T) {
 		clusterScope *scope.PowerVSClusterScope
 	)
 	reconciler = IBMPowerVSClusterReconciler{
-		Client:         testEnv.Client,
-		UncachedClient: testEnv.Client,
+		Client: testEnv.Client,
 	}
 	t.Run("Reconciling delete IBMPowerVSCluster", func(t *testing.T) {
 		t.Run("Should reconcile successfully if no descendants are found", func(t *testing.T) {

diff --git a/main.go b/main.go
@@ -34,7 +34,6 @@ import (
 
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	capiv1beta1 "sigs.k8s.io/cluster-api/api/v1beta1"
@@ -243,14 +242,8 @@ func setupReconcilers(mgr ctrl.Manager, serviceEndpoint []endpoints.ServiceEndpo
 		os.Exit(1)
 	}
 
-	cfg := ctrl.GetConfigOrDie()
-	uncachedClient, err := client.New(cfg, client.Options{Scheme: mgr.GetScheme(), Mapper: mgr.GetRESTMapper()})
-	if err != nil {
-		setupLog.Error(err, "unable to set up uncached client")
-	}
 	if err := (&controllers.IBMPowerVSClusterReconciler{
 		Client:          mgr.GetClient(),
-		UncachedClient:  uncachedClient,
 		Recorder:        mgr.GetEventRecorderFor("ibmpowervscluster-controller"),
 		ServiceEndpoint: serviceEndpoint,
 		Scheme:          mgr.GetScheme(),