Few fixes

Author: varshaprasad96

Makefile

@@ -95,11 +95,11 @@ endif
 
 .PHONY: install
 install: manifests kustomize ## Install APIResourceSchemas and APIExport into kcp (using $KUBECONFIG or ~/.kube/config).
-	kustomize build config/kcp | kubectl apply -f -
+	$(KUSTOMIZE) build config/kcp | kubectl apply -f -
 
 .PHONY: uninstall
 uninstall: manifests kustomize ## Uninstall APIResourceSchemas and APIExport from kcp (using $KUBECONFIG or ~/.kube/config). Call with ignore-not-found=true to ignore resource not found errors during deletion.
-	kustomize build config/kcp | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
+	$(KUSTOMIZE) build config/kcp | kubectl delete --ignore-not-found=$(ignore-not-found) -f -
 
 .PHONY: deploy-crd
 deploy-crd: manifests kustomize ## Deploy controller

controllers/configmap_controller.go

@@ -26,8 +26,6 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
 
-	kcpclient "github.com/kcp-dev/apimachinery/pkg/client"
-
 	"github.com/kcp-dev/logicalcluster"
 
 	ctrl "sigs.k8s.io/controller-runtime"
@@ -55,7 +53,7 @@ type ConfigMapReconciler struct {
 func (r *ConfigMapReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
 	log := log.FromContext(ctx).WithValues("cluster", req.ClusterName)
 
-	ctx = kcpclient.WithCluster(ctx, logicalcluster.New(req.ClusterName))
+	ctx = logicalcluster.WithCluster(ctx, logicalcluster.New(req.ClusterName))
 
 	// Test get
 	var configMap corev1.ConfigMap

controllers/widget_controller.go

@@ -19,7 +19,6 @@ package controllers
 import (
 	"context"
 
-	kcpclient "github.com/kcp-dev/apimachinery/pkg/client"
 	"github.com/kcp-dev/logicalcluster"
 	"k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/apimachinery/pkg/runtime"
@@ -57,7 +56,7 @@ func (r *WidgetReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctr
 	logger.Info("Listed all widgets across all workspaces", "count", len(allWidgets.Items))
 
 	// Add the logical cluster to the context
-	ctx = kcpclient.WithCluster(ctx, logicalcluster.New(req.ClusterName))
+	ctx = logicalcluster.WithCluster(ctx, logicalcluster.New(req.ClusterName))
 
 	logger.Info("Getting widget")
 	var w datav1alpha1.Widget