diff --git a/api/v1alpha1/proxydefaults_webhook_test.go b/api/v1alpha1/proxydefaults_webhook_test.go
index 11af7a6f00..323059103e 100644
--- a/api/v1alpha1/proxydefaults_webhook_test.go
+++ b/api/v1alpha1/proxydefaults_webhook_test.go
@@ -85,7 +85,7 @@ func TestValidateProxyDefault(t *testing.T) {
 			require.NoError(t, err)
 			s := runtime.NewScheme()
 			s.AddKnownTypes(GroupVersion, &ProxyDefaults{}, &ProxyDefaultsList{})
-			client := fake.NewFakeClientWithScheme(s, c.existingResources...)
+			client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.existingResources...).Build()
 			decoder, err := admission.NewDecoder(s)
 			require.NoError(t, err)
 
diff --git a/api/v1alpha1/serviceintentions_webhook_test.go b/api/v1alpha1/serviceintentions_webhook_test.go
index 825e1bec16..8416bcd525 100644
--- a/api/v1alpha1/serviceintentions_webhook_test.go
+++ b/api/v1alpha1/serviceintentions_webhook_test.go
@@ -243,7 +243,7 @@ func TestHandle_ServiceIntentions_Create(t *testing.T) {
 			require.NoError(t, err)
 			s := runtime.NewScheme()
 			s.AddKnownTypes(GroupVersion, &ServiceIntentions{}, &ServiceIntentionsList{})
-			client := fake.NewFakeClientWithScheme(s, c.existingResources...)
+			client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.existingResources...).Build()
 			decoder, err := admission.NewDecoder(s)
 			require.NoError(t, err)
 
@@ -430,7 +430,7 @@ func TestHandle_ServiceIntentions_Update(t *testing.T) {
 			require.NoError(t, err)
 			s := runtime.NewScheme()
 			s.AddKnownTypes(GroupVersion, &ServiceIntentions{}, &ServiceIntentionsList{})
-			client := fake.NewFakeClientWithScheme(s, c.existingResources...)
+			client := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.existingResources...).Build()
 			decoder, err := admission.NewDecoder(s)
 			require.NoError(t, err)
 
@@ -589,7 +589,7 @@ func TestHandle_ServiceIntentions_Patches(t *testing.T) {
 				require.NoError(t, err)
 				s := runtime.NewScheme()
 				s.AddKnownTypes(GroupVersion, &ServiceIntentions{}, &ServiceIntentionsList{})
-				client := fake.NewFakeClientWithScheme(s)
+				client := fake.NewClientBuilder().WithScheme(s).Build()
 				decoder, err := admission.NewDecoder(s)
 				require.NoError(t, err)
 
diff --git a/controller/configentry_controller.go b/controller/configentry_controller.go
index 0556d24b98..ab6d8d59a9 100644
--- a/controller/configentry_controller.go
+++ b/controller/configentry_controller.go
@@ -83,13 +83,8 @@ type ConfigEntryController struct {
 // CRD-specific controller should pass themselves in as updater since we
 // need to call back into their own update methods to ensure they update their
 // internal state.
-func (r *ConfigEntryController) ReconcileEntry(
-	crdCtrl Controller,
-	ctx context.Context,
-	req ctrl.Request,
-	configEntry common.ConfigEntryResource) (ctrl.Result, error) {
+func (r *ConfigEntryController) ReconcileEntry(ctx context.Context, crdCtrl Controller, req ctrl.Request, configEntry common.ConfigEntryResource) (ctrl.Result, error) {
 	logger := crdCtrl.Logger(req.NamespacedName)
-
 	err := crdCtrl.Get(ctx, req.NamespacedName, configEntry)
 	if k8serr.IsNotFound(err) {
 		return ctrl.Result{}, client.IgnoreNotFound(err)
@@ -100,11 +95,11 @@ func (r *ConfigEntryController) ReconcileEntry(
 
 	consulEntry := configEntry.ToConsul(r.DatacenterName)
 
-	if configEntry.GetObjectMeta().DeletionTimestamp.IsZero() {
+	if configEntry.GetDeletionTimestamp().IsZero() {
 		// The object is not being deleted, so if it does not have our finalizer,
 		// then let's add the finalizer and update the object. This is equivalent
 		// registering our finalizer.
-		if !containsString(configEntry.GetObjectMeta().Finalizers, FinalizerName) {
+		if !containsString(configEntry.GetFinalizers(), FinalizerName) {
 			configEntry.AddFinalizer(FinalizerName)
 			if err := r.syncUnknown(ctx, crdCtrl, configEntry); err != nil {
 				return ctrl.Result{}, err
@@ -112,7 +107,7 @@ func (r *ConfigEntryController) ReconcileEntry(
 		}
 	} else {
 		// The object is being deleted
-		if containsString(configEntry.GetObjectMeta().Finalizers, FinalizerName) {
+		if containsString(configEntry.GetFinalizers(), FinalizerName) {
 			logger.Info("deletion event")
 			// Check to see if consul has config entry with the same name
 			entry, _, err := r.ConsulClient.ConfigEntries().Get(configEntry.ConsulKind(), configEntry.ConsulName(), &capi.QueryOptions{
diff --git a/controller/configentry_controller_ent_test.go b/controller/configentry_controller_ent_test.go
index e4956e420f..8c27cbc89d 100644
--- a/controller/configentry_controller_ent_test.go
+++ b/controller/configentry_controller_ent_test.go
@@ -202,7 +202,7 @@ func TestConfigEntryController_createsConfigEntry_consulNamespaces(tt *testing.T
 				})
 				req.NoError(err)
 
-				fakeClient := fake.NewFakeClientWithScheme(s, in.KubeResource)
+				fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(in.KubeResource).Build()
 
 				r := in.GetController(
 					fakeClient,
@@ -468,7 +468,7 @@ func TestConfigEntryController_updatesConfigEntry_consulNamespaces(tt *testing.T
 				})
 				req.NoError(err)
 
-				fakeClient := fake.NewFakeClientWithScheme(s, in.KubeResource)
+				fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(in.KubeResource).Build()
 
 				r := in.GetControllerFunc(
 					fakeClient,
@@ -721,7 +721,7 @@ func TestConfigEntryController_deletesConfigEntry_consulNamespaces(tt *testing.T
 				})
 				req.NoError(err)
 
-				fakeClient := fake.NewFakeClientWithScheme(s, in.KubeResource)
+				fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(in.KubeResource).Build()
 
 				r := in.GetControllerFunc(
 					fakeClient,
diff --git a/controller/configentry_controller_test.go b/controller/configentry_controller_test.go
index bb33bb18a8..75743ea288 100644
--- a/controller/configentry_controller_test.go
+++ b/controller/configentry_controller_test.go
@@ -391,7 +391,7 @@ func TestConfigEntryControllers_createsConfigEntry(t *testing.T) {
 
 			s := runtime.NewScheme()
 			s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResource)
-			client := fake.NewFakeClientWithScheme(s, c.configEntryResource)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResource).Build()
 
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			req.NoError(err)
@@ -408,7 +408,7 @@ func TestConfigEntryControllers_createsConfigEntry(t *testing.T) {
 				req.True(written)
 			}
 
-			r := c.reconciler(client, consulClient, logrtest.TestLogger{T: t})
+			r := c.reconciler(fakeClient, consulClient, logrtest.TestLogger{T: t})
 			namespacedName := types.NamespacedName{
 				Namespace: kubeNS,
 				Name:      c.configEntryResource.KubernetesName(),
@@ -425,7 +425,7 @@ func TestConfigEntryControllers_createsConfigEntry(t *testing.T) {
 			c.compare(t, cfg)
 
 			// Check that the status is "synced".
-			err = client.Get(ctx, namespacedName, c.configEntryResource)
+			err = fakeClient.Get(ctx, namespacedName, c.configEntryResource)
 			req.NoError(err)
 			req.Equal(corev1.ConditionTrue, c.configEntryResource.SyncedConditionStatus())
 
@@ -830,7 +830,7 @@ func TestConfigEntryControllers_updatesConfigEntry(t *testing.T) {
 
 			s := runtime.NewScheme()
 			s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResource)
-			client := fake.NewFakeClientWithScheme(s, c.configEntryResource)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResource).Build()
 
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			req.NoError(err)
@@ -864,14 +864,14 @@ func TestConfigEntryControllers_updatesConfigEntry(t *testing.T) {
 					Name:      c.configEntryResource.KubernetesName(),
 				}
 				// First get it so we have the latest revision number.
-				err = client.Get(ctx, namespacedName, c.configEntryResource)
+				err = fakeClient.Get(ctx, namespacedName, c.configEntryResource)
 				req.NoError(err)
 
 				// Update the entry in Kube and run reconcile.
 				c.updateF(c.configEntryResource)
-				err := client.Update(ctx, c.configEntryResource)
+				err := fakeClient.Update(ctx, c.configEntryResource)
 				req.NoError(err)
-				r := c.reconciler(client, consulClient, logrtest.TestLogger{T: t})
+				r := c.reconciler(fakeClient, consulClient, logrtest.TestLogger{T: t})
 				resp, err := r.Reconcile(ctx, ctrl.Request{
 					NamespacedName: namespacedName,
 				})
@@ -1200,7 +1200,7 @@ func TestConfigEntryControllers_deletesConfigEntry(t *testing.T) {
 
 			s := runtime.NewScheme()
 			s.AddKnownTypes(v1alpha1.GroupVersion, c.configEntryResourceWithDeletion)
-			client := fake.NewFakeClientWithScheme(s, c.configEntryResourceWithDeletion)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(c.configEntryResourceWithDeletion).Build()
 
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			req.NoError(err)
@@ -1233,7 +1233,7 @@ func TestConfigEntryControllers_deletesConfigEntry(t *testing.T) {
 					Namespace: kubeNS,
 					Name:      c.configEntryResourceWithDeletion.KubernetesName(),
 				}
-				r := c.reconciler(client, consulClient, logrtest.TestLogger{T: t})
+				r := c.reconciler(fakeClient, consulClient, logrtest.TestLogger{T: t})
 				resp, err := r.Reconcile(context.Background(), ctrl.Request{
 					NamespacedName: namespacedName,
 				})
@@ -1267,7 +1267,7 @@ func TestConfigEntryControllers_errorUpdatesSyncStatus(t *testing.T) {
 
 	s := runtime.NewScheme()
 	s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults)
-	client := fake.NewFakeClientWithScheme(s, svcDefaults)
+	fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build()
 
 	// Construct a Consul client that will error by giving it
 	// an unresolvable address.
@@ -1276,7 +1276,7 @@ func TestConfigEntryControllers_errorUpdatesSyncStatus(t *testing.T) {
 	})
 	req.NoError(err)
 	reconciler := &ServiceDefaultsController{
-		Client: client,
+		Client: fakeClient,
 		Log:    logrtest.TestLogger{T: t},
 		ConfigEntryController: &ConfigEntryController{
 			ConsulClient:   consulClient,
@@ -1299,7 +1299,7 @@ func TestConfigEntryControllers_errorUpdatesSyncStatus(t *testing.T) {
 	req.False(resp.Requeue)
 
 	// Check that the status is "synced=false".
-	err = client.Get(ctx, namespacedName, svcDefaults)
+	err = fakeClient.Get(ctx, namespacedName, svcDefaults)
 	req.NoError(err)
 	status, reason, errMsg := svcDefaults.SyncedCondition()
 	req.Equal(corev1.ConditionFalse, status)
@@ -1335,7 +1335,7 @@ func TestConfigEntryControllers_setsSyncedToTrue(t *testing.T) {
 	s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults)
 
 	// The config entry exists in kube but its status will be nil.
-	client := fake.NewFakeClientWithScheme(s, svcDefaults)
+	fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build()
 
 	consul, err := testutil.NewTestServerConfigT(t, nil)
 	req.NoError(err)
@@ -1347,7 +1347,7 @@ func TestConfigEntryControllers_setsSyncedToTrue(t *testing.T) {
 	})
 	req.NoError(err)
 	reconciler := &ServiceDefaultsController{
-		Client: client,
+		Client: fakeClient,
 		Log:    logrtest.TestLogger{T: t},
 		ConfigEntryController: &ConfigEntryController{
 			ConsulClient:   consulClient,
@@ -1371,7 +1371,7 @@ func TestConfigEntryControllers_setsSyncedToTrue(t *testing.T) {
 	req.False(resp.Requeue)
 
 	// Check that the status is now "synced".
-	err = client.Get(ctx, namespacedName, svcDefaults)
+	err = fakeClient.Get(ctx, namespacedName, svcDefaults)
 	req.NoError(err)
 	req.Equal(corev1.ConditionTrue, svcDefaults.SyncedConditionStatus())
 }
@@ -1412,7 +1412,7 @@ func TestConfigEntryControllers_doesNotCreateUnownedConfigEntry(t *testing.T) {
 				},
 			}
 			s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaults)
-			client := fake.NewFakeClientWithScheme(s, svcDefaults)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaults).Build()
 
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			req.NoError(err)
@@ -1439,12 +1439,12 @@ func TestConfigEntryControllers_doesNotCreateUnownedConfigEntry(t *testing.T) {
 					Name:      svcDefaults.KubernetesName(),
 				}
 				// First get it so we have the latest revision number.
-				err = client.Get(ctx, namespacedName, svcDefaults)
+				err = fakeClient.Get(ctx, namespacedName, svcDefaults)
 				req.NoError(err)
 
 				// Attempt to create the entry in Kube and run reconcile.
 				reconciler := ServiceDefaultsController{
-					Client: client,
+					Client: fakeClient,
 					Log:    logrtest.TestLogger{T: t},
 					ConfigEntryController: &ConfigEntryController{
 						ConsulClient:   consulClient,
@@ -1463,7 +1463,7 @@ func TestConfigEntryControllers_doesNotCreateUnownedConfigEntry(t *testing.T) {
 				req.Equal(cfg.GetMeta()[common.DatacenterKey], c.datacenterAnnotation)
 
 				// Check that the status is "synced=false".
-				err = client.Get(ctx, namespacedName, svcDefaults)
+				err = fakeClient.Get(ctx, namespacedName, svcDefaults)
 				req.NoError(err)
 				status, reason, errMsg := svcDefaults.SyncedCondition()
 				req.Equal(corev1.ConditionFalse, status)
@@ -1501,7 +1501,7 @@ func TestConfigEntryControllers_doesNotDeleteUnownedConfig(t *testing.T) {
 				},
 			}
 			s.AddKnownTypes(v1alpha1.GroupVersion, svcDefaultsWithDeletion)
-			client := fake.NewFakeClientWithScheme(s, svcDefaultsWithDeletion)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(svcDefaultsWithDeletion).Build()
 
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			req.NoError(err)
@@ -1513,7 +1513,7 @@ func TestConfigEntryControllers_doesNotDeleteUnownedConfig(t *testing.T) {
 			})
 			req.NoError(err)
 			reconciler := &ServiceDefaultsController{
-				Client: client,
+				Client: fakeClient,
 				Log:    logrtest.TestLogger{T: t},
 				ConfigEntryController: &ConfigEntryController{
 					ConsulClient:   consulClient,
@@ -1549,7 +1549,7 @@ func TestConfigEntryControllers_doesNotDeleteUnownedConfig(t *testing.T) {
 
 				// Check that the resource is deleted from cluster.
 				svcDefault := &v1alpha1.ServiceDefaults{}
-				_ = client.Get(ctx, namespacedName, svcDefault)
+				_ = fakeClient.Get(ctx, namespacedName, svcDefault)
 				require.Empty(t, svcDefault.Finalizers())
 			}
 		})
@@ -1588,7 +1588,7 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) {
 		},
 	}
 
-	client := fake.NewFakeClientWithScheme(s, defaults, splitter)
+	fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(defaults, splitter).Build()
 
 	consul, err := testutil.NewTestServerConfigT(t, nil)
 	require.NoError(t, err)
@@ -1603,7 +1603,7 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) {
 	logger := logrtest.TestLogger{T: t}
 
 	svcDefaultsReconciler := ServiceDefaultsController{
-		Client: client,
+		Client: fakeClient,
 		Log:    logger,
 		ConfigEntryController: &ConfigEntryController{
 			ConsulClient:   consulClient,
@@ -1611,7 +1611,7 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) {
 		},
 	}
 	svcSplitterReconciler := ServiceSplitterController{
-		Client: client,
+		Client: fakeClient,
 		Log:    logger,
 		ConfigEntryController: &ConfigEntryController{
 			ConsulClient:   consulClient,
@@ -1638,12 +1638,12 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) {
 	require.NoError(t, err)
 	require.False(t, resp.Requeue)
 
-	err = client.Get(ctx, defaultsNamespacedName, defaults)
+	err = fakeClient.Get(ctx, defaultsNamespacedName, defaults)
 	require.NoError(t, err)
 
 	// Update service-defaults with deletion timestamp so that it attempts deletion on reconcile.
 	defaults.ObjectMeta.DeletionTimestamp = &metav1.Time{Time: time.Now()}
-	err = client.Update(ctx, defaults)
+	err = fakeClient.Update(ctx, defaults)
 	require.NoError(t, err)
 
 	// Reconcile should fail as the service-splitter still required the service-defaults causing the delete operation on Consul to fail.
@@ -1651,7 +1651,7 @@ func TestConfigEntryControllers_updatesStatusWhenDeleteFails(t *testing.T) {
 	require.EqualError(t, err, "deleting config entry from consul: Unexpected response code: 500 (discovery chain \"service\" uses a protocol \"tcp\" that does not permit advanced routing or splitting behavior)")
 	require.False(t, resp.Requeue)
 
-	err = client.Get(ctx, defaultsNamespacedName, defaults)
+	err = fakeClient.Get(ctx, defaultsNamespacedName, defaults)
 	require.NoError(t, err)
 
 	// Ensure the status of the resource is updated to display failure reason.
@@ -1725,7 +1725,7 @@ func TestConfigEntryController_Migration(t *testing.T) {
 			s := runtime.NewScheme()
 			s.AddKnownTypes(v1alpha1.GroupVersion, &v1alpha1.ServiceDefaults{})
 
-			client := fake.NewFakeClientWithScheme(s, &c.KubeResource)
+			fakeClient := fake.NewClientBuilder().WithScheme(s).WithRuntimeObjects(&c.KubeResource).Build()
 			consul, err := testutil.NewTestServerConfigT(t, nil)
 			require.NoError(t, err)
 			defer consul.Stop()
@@ -1744,7 +1744,7 @@ func TestConfigEntryController_Migration(t *testing.T) {
 			// Set up the reconciler.
 			logger := logrtest.TestLogger{T: t}
 			svcDefaultsReconciler := ServiceDefaultsController{
-				Client: client,
+				Client: fakeClient,
 				Log:    logger,
 				ConfigEntryController: &ConfigEntryController{
 					ConsulClient:   consulClient,
@@ -1768,7 +1768,7 @@ func TestConfigEntryController_Migration(t *testing.T) {
 			}
 
 			entryAfterReconcile := &v1alpha1.ServiceDefaults{}
-			err = client.Get(ctx, defaultsNamespacedName, entryAfterReconcile)
+			err = fakeClient.Get(ctx, defaultsNamespacedName, entryAfterReconcile)
 			require.NoError(t, err)
 
 			syncCondition := entryAfterReconcile.GetCondition(v1alpha1.ConditionSynced)
diff --git a/controller/ingressgateway_controller.go b/controller/ingressgateway_controller.go
index beae006f96..b43cee3e84 100644
--- a/controller/ingressgateway_controller.go
+++ b/controller/ingressgateway_controller.go
@@ -24,7 +24,7 @@ type IngressGatewayController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=ingressgateways/status,verbs=get;update;patch
 
 func (r *IngressGatewayController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.IngressGateway{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.IngressGateway{})
 }
 
 func (r *IngressGatewayController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/proxydefaults_controller.go b/controller/proxydefaults_controller.go
index f00f7667fd..1956228756 100644
--- a/controller/proxydefaults_controller.go
+++ b/controller/proxydefaults_controller.go
@@ -24,7 +24,7 @@ type ProxyDefaultsController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=proxydefaults/status,verbs=get;update;patch
 
 func (r *ProxyDefaultsController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ProxyDefaults{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ProxyDefaults{})
 }
 
 func (r *ProxyDefaultsController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/servicedefaults_controller.go b/controller/servicedefaults_controller.go
index c461eb8b8d..5381deda15 100644
--- a/controller/servicedefaults_controller.go
+++ b/controller/servicedefaults_controller.go
@@ -24,7 +24,7 @@ type ServiceDefaultsController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=servicedefaults/status,verbs=get;update;patch
 
 func (r *ServiceDefaultsController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ServiceDefaults{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ServiceDefaults{})
 }
 
 func (r *ServiceDefaultsController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/serviceintentions_controller.go b/controller/serviceintentions_controller.go
index 1f730c0d2c..69221ffc17 100644
--- a/controller/serviceintentions_controller.go
+++ b/controller/serviceintentions_controller.go
@@ -24,7 +24,7 @@ type ServiceIntentionsController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=serviceintentions/status,verbs=get;update;patch
 
 func (r *ServiceIntentionsController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ServiceIntentions{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ServiceIntentions{})
 }
 
 func (r *ServiceIntentionsController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/serviceresolver_controller.go b/controller/serviceresolver_controller.go
index de208f1c00..9a910dcd41 100644
--- a/controller/serviceresolver_controller.go
+++ b/controller/serviceresolver_controller.go
@@ -24,7 +24,7 @@ type ServiceResolverController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=serviceresolvers/status,verbs=get;update;patch
 
 func (r *ServiceResolverController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ServiceResolver{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ServiceResolver{})
 }
 
 func (r *ServiceResolverController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/servicerouter_controller.go b/controller/servicerouter_controller.go
index 9b86722f82..6677a3c8c3 100644
--- a/controller/servicerouter_controller.go
+++ b/controller/servicerouter_controller.go
@@ -24,7 +24,7 @@ type ServiceRouterController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=servicerouters/status,verbs=get;update;patch
 
 func (r *ServiceRouterController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ServiceRouter{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ServiceRouter{})
 }
 
 func (r *ServiceRouterController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/servicesplitter_controller.go b/controller/servicesplitter_controller.go
index 7256eb79cf..1256befdda 100644
--- a/controller/servicesplitter_controller.go
+++ b/controller/servicesplitter_controller.go
@@ -24,7 +24,7 @@ type ServiceSplitterController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=servicesplitters/status,verbs=get;update;patch
 
 func (r *ServiceSplitterController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.ServiceSplitter{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.ServiceSplitter{})
 }
 
 func (r *ServiceSplitterController) Logger(name types.NamespacedName) logr.Logger {
diff --git a/controller/terminatinggateway_controller.go b/controller/terminatinggateway_controller.go
index 48f0643cab..060a3db0af 100644
--- a/controller/terminatinggateway_controller.go
+++ b/controller/terminatinggateway_controller.go
@@ -24,7 +24,7 @@ type TerminatingGatewayController struct {
 // +kubebuilder:rbac:groups=consul.hashicorp.com,resources=terminatinggateways/status,verbs=get;update;patch
 
 func (r *TerminatingGatewayController) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
-	return r.ConfigEntryController.ReconcileEntry(r, ctx, req, &consulv1alpha1.TerminatingGateway{})
+	return r.ConfigEntryController.ReconcileEntry(ctx, r, req, &consulv1alpha1.TerminatingGateway{})
 }
 
 func (r *TerminatingGatewayController) Logger(name types.NamespacedName) logr.Logger {