UPSTREAM: <carry>: only call cluster-aware keyFunc for cluster-aware cache

Signed-off-by: Dr. Stefan Schimanski <[email protected]>

Author: sttts

pkg/cache/cache.go

@@ -20,6 +20,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 	"time"
 
 	"github.com/kcp-dev/apimachinery/v2/third_party/informers"
@@ -391,6 +392,7 @@ func newCache(restConfig *rest.Config, opts Options) newCacheFunc {
 				NewInformer:           opts.NewInformerFunc,
 			}),
 			readerFailOnMissingInformer: opts.ReaderFailOnMissingInformer,
+			clusterIndexes:              strings.HasSuffix(restConfig.Host, "/clusters/*"),
 		}
 	}
 }

pkg/cache/informer_cache.go

@@ -70,6 +70,7 @@ type informerCache struct {
 	scheme *runtime.Scheme
 	*internal.Informers
 	readerFailOnMissingInformer bool
+	clusterIndexes              bool
 }
 
 // Get implements Reader.
@@ -219,10 +220,10 @@ func (ic *informerCache) IndexField(ctx context.Context, obj client.Object, fiel
 	if err != nil {
 		return err
 	}
-	return indexByField(informer, field, extractValue)
+	return indexByField(informer, field, extractValue, ic.clusterIndexes)
 }
 
-func indexByField(informer Informer, field string, extractValue client.IndexerFunc) error {
+func indexByField(informer Informer, field string, extractValue client.IndexerFunc, clusterIndexes bool) error {
 	indexFunc := func(objRaw interface{}) ([]string, error) {
 		// TODO(directxman12): check if this is the correct type?
 		obj, isObj := objRaw.(client.Object)
@@ -236,7 +237,7 @@ func indexByField(informer Informer, field string, extractValue client.IndexerFu
 		ns := meta.GetNamespace()
 
 		keyFunc := internal.KeyToNamespacedKey
-		if clusterName := logicalcluster.From(obj); !clusterName.Empty() {
+		if clusterName := logicalcluster.From(obj); clusterIndexes && !clusterName.Empty() {
 			keyFunc = func(ns, val string) string {
 				return internal.KeyToClusteredKey(clusterName.String(), ns, val)
 			}