Drop cluster from objectkey

Author: fabianvf

pkg/cache/internal/cache_reader.go

@@ -57,11 +57,11 @@ type CacheReader struct {
 }
 
 // Get checks the indexer for the object and writes a copy of it if found.
-func (c *CacheReader) Get(_ context.Context, key client.ObjectKey, out client.Object) error {
+func (c *CacheReader) Get(ctx context.Context, key client.ObjectKey, out client.Object) error {
 	if c.scopeName == apimeta.RESTScopeNameRoot {
 		key.Namespace = ""
 	}
-	storeKey := objectKeyToStoreKey(key)
+	storeKey := objectKeyToStoreKey(ctx, key)
 
 	// Lookup the object from the indexer cache
 	obj, exists, err := c.indexer.GetByKey(storeKey)
@@ -194,8 +194,16 @@ func (c *CacheReader) List(ctx context.Context, out client.ObjectList, opts ...c
 // It's akin to MetaNamespaceKeyFunc.  It's separate from
 // String to allow keeping the key format easily in sync with
 // MetaNamespaceKeyFunc.
-func objectKeyToStoreKey(k client.ObjectKey) string {
-	return kcpcache.ToClusterAwareKey(k.Cluster.String(), k.Namespace, k.Name)
+func objectKeyToStoreKey(ctx context.Context, k client.ObjectKey) string {
+	cluster, ok := kcpclient.ClusterFromContext(ctx)
+	if ok {
+		return kcpcache.ToClusterAwareKey(cluster.String(), k.Namespace, k.Name)
+	}
+
+	if k.Namespace == "" {
+		return k.Name
+	}
+	return k.Namespace + "/" + k.Name
 }
 
 // requiresExactMatch checks if the given field selector is of the form `k=v` or `k==v`.

pkg/client/interfaces.go

@@ -20,8 +20,6 @@ import (
 	"context"
 	"time"
 
-	"github.com/kcp-dev/logicalcluster"
-
 	apierrors "k8s.io/apimachinery/pkg/api/errors"
 	"k8s.io/client-go/tools/cache"
 
@@ -31,15 +29,11 @@ import (
 	"k8s.io/apimachinery/pkg/watch"
 )
 
-type ObjectKey struct {
-	types.NamespacedName
-
-	Cluster logicalcluster.Name
-}
+type ObjectKey = types.NamespacedName
 
 // ObjectKeyFromObject returns the ObjectKey given a runtime.Object.
 func ObjectKeyFromObject(obj Object) ObjectKey {
-	return ObjectKey{NamespacedName: types.NamespacedName{Namespace: obj.GetNamespace(), Name: obj.GetName()}, Cluster: logicalcluster.From(obj)}
+	return ObjectKey{Namespace: obj.GetNamespace(), Name: obj.GetName()}
 }
 
 // Patch is a patch that can be applied to a Kubernetes object.

pkg/handler/enqueue.go

@@ -18,7 +18,6 @@ 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"
@@ -77,11 +76,11 @@ func (e *EnqueueRequestForObject) Generic(evt event.GenericEvent, q workqueue.Ra
 }
 
 func request(obj client.Object) reconcile.Request {
-	return reconcile.Request{client.ObjectKey{
-		Cluster: logicalcluster.From(obj),
-		NamespacedName: types.NamespacedName{
+	return reconcile.Request{
+		ClusterName: logicalcluster.From(obj).String(),
+		ObjectKey: client.ObjectKey{
 			Namespace: obj.GetNamespace(),
 			Name:      obj.GetName(),
 		},
-	}}
+	}
 }

pkg/handler/enqueue_owner.go

@@ -24,7 +24,6 @@ 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"
@@ -137,11 +136,9 @@ func (e *EnqueueRequestForOwner) getOwnerReconcileRequest(object metav1.Object,
 		if ref.Kind == e.groupKind.Kind && refGV.Group == e.groupKind.Group {
 			// Match found - add a Request for the object referred to in the OwnerReference
 			request := reconcile.Request{
+				ClusterName: logicalcluster.From(object).String(),
 				ObjectKey: client.ObjectKey{
-					Cluster: logicalcluster.From(object),
-					NamespacedName: types.NamespacedName{
-						Name: ref.Name,
-					},
+					Name: ref.Name,
 				},
 			}
 

pkg/reconcile/reconcile.go

@@ -47,6 +47,8 @@ func (r *Result) IsZero() bool {
 type Request struct {
 	// ObjectKey is the name, namespace, and cluster of the object to reconcile.
 	client.ObjectKey
+
+	ClusterName string
 }
 
 /*