UPSTREAM: <drop>: undo remaining ObjectKey/NamespacedName changes

Signed-off-by: Andy Goldstein <[email protected]>

Author: ncdc

pkg/envtest/crd.go

@@ -253,7 +253,7 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1.CustomResourceDefin
 		crd := crd
 		log.V(1).Info("installing CRD", "crd", crd.GetName())
 		existingCrd := crd.DeepCopy()
-		err := cs.Get(context.TODO(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: crd.GetName()}}, existingCrd)
+		err := cs.Get(context.TODO(), types.NamespacedName{Name: crd.GetName()}, existingCrd)
 		switch {
 		case apierrors.IsNotFound(err):
 			if err := cs.Create(context.TODO(), crd); err != nil {
@@ -264,7 +264,7 @@ func CreateCRDs(config *rest.Config, crds []*apiextensionsv1.CustomResourceDefin
 		default:
 			log.V(1).Info("CRD already exists, updating", "crd", crd.GetName())
 			if err := retry.RetryOnConflict(retry.DefaultBackoff, func() error {
-				if err := cs.Get(context.TODO(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: crd.GetName()}}, existingCrd); err != nil {
+				if err := cs.Get(context.TODO(), types.NamespacedName{Name: crd.GetName()}, existingCrd); err != nil {
 					return err
 				}
 				crd.SetResourceVersion(existingCrd.GetResourceVersion())

pkg/envtest/webhook.go

@@ -234,11 +234,9 @@ func (p *webhookPoller) poll() (done bool, err error) {
 		for _, name := range names.List() {
 			var obj = &unstructured.Unstructured{}
 			obj.SetGroupVersionKind(gvk)
-			err := c.Get(context.Background(), client.ObjectKey{
-				NamespacedName: types.NamespacedName{
-					Namespace: "",
-					Name:      name,
-				},
+			err := c.Get(context.Background(), types.NamespacedName{
+				Namespace: "",
+				Name:      name,
 			}, obj)
 
 			if err == nil {
@@ -318,7 +316,7 @@ func createWebhooks(config *rest.Config, mutHooks []*admissionv1.MutatingWebhook
 // ensureCreated creates or update object if already exists in the cluster.
 func ensureCreated(cs client.Client, obj client.Object) error {
 	existing := obj.DeepCopyObject().(client.Object)
-	err := cs.Get(context.Background(), client.ObjectKey{NamespacedName: types.NamespacedName{Name: obj.GetName()}}, existing)
+	err := cs.Get(context.Background(), types.NamespacedName{Name: obj.GetName()}, existing)
 	switch {
 	case apierrors.IsNotFound(err):
 		if err := cs.Create(context.Background(), obj); err != nil {

pkg/handler/enqueue.go

@@ -18,6 +18,7 @@ package handler
 
 import (
 	"github.com/kcp-dev/logicalcluster"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
@@ -79,7 +80,7 @@ func request(obj client.Object) reconcile.Request {
 	return reconcile.Request{
 		// TODO(kcp) Need to implement a non-kcp-specific way to support this
 		ClusterName: logicalcluster.From(obj).String(),
-		ObjectKey: client.ObjectKey{
+		NamespacedName: types.NamespacedName{
 			Namespace: obj.GetNamespace(),
 			Name:      obj.GetName(),
 		},

pkg/handler/enqueue_owner.go

@@ -24,8 +24,8 @@ import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/runtime/schema"
+	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/util/workqueue"
-	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/event"
 	logf "sigs.k8s.io/controller-runtime/pkg/internal/log"
 	"sigs.k8s.io/controller-runtime/pkg/reconcile"
@@ -137,7 +137,7 @@ func (e *EnqueueRequestForOwner) getOwnerReconcileRequest(object metav1.Object,
 			// Match found - add a Request for the object referred to in the OwnerReference
 			request := reconcile.Request{
 				ClusterName: logicalcluster.From(object).String(),
-				ObjectKey: client.ObjectKey{
+				NamespacedName: types.NamespacedName{
 					Name: ref.Name,
 				},
 			}

pkg/reconcile/reconcile.go

@@ -20,7 +20,7 @@ import (
 	"context"
 	"time"
 
-	"sigs.k8s.io/controller-runtime/pkg/client"
+	"k8s.io/apimachinery/pkg/types"
 )
 
 // Result contains the result of a Reconciler invocation.
@@ -45,8 +45,8 @@ func (r *Result) IsZero() bool {
 // information to uniquely identify the object - its Name and Namespace.  It does NOT contain information about
 // any specific Event or the object contents itself.
 type Request struct {
-	// ObjectKey is the name, namespace, and cluster of the object to reconcile.
-	client.ObjectKey
+	// NamespacedName is the name and namespace of the object to reconcile.
+	types.NamespacedName
 
 	// ClusterName can be used for reconciling requests across multiple clusters,
 	// to prevent objects with the same name and namespace from conflicting