UPSTREAM: SQUASH: IndexField: 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"
 
 	"golang.org/x/exp/maps"
@@ -390,6 +391,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)
 			}

pkg/cache/kcp_test.go

@@ -22,6 +22,7 @@ import (
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/fields"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/kcp"
@@ -56,6 +57,31 @@ var _ = Describe("KCP cluster-unaware informer cache", func() {
 		err = c.Get(ctx, client.ObjectKey{Name: "default"}, ns)
 		Expect(err).NotTo(HaveOccurred())
 	})
+
+	It("should support indexes with cluster-less keys", func() {
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+
+		c, err := cache.New(cfg, cache.Options{})
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Indexing the default namespace by name")
+		err = c.IndexField(ctx, &corev1.Namespace{}, "my-name", func(obj client.Object) []string {
+			return []string{"my-key-" + obj.GetName()}
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		go c.Start(ctx) //nolint:errcheck // Start is blocking, and error not relevant here.
+		c.WaitForCacheSync(ctx)
+
+		By("By getting the default namespace via the custom index")
+		nss := &corev1.NamespaceList{}
+		err = c.List(ctx, nss, client.MatchingFieldsSelector{
+			Selector: fields.OneTermEqualSelector("my-name", "my-key-default"),
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(nss.Items).To(HaveLen(1))
+	})
 })
 
 var _ = Describe("KCP cluster-aware informer cache", func() {
@@ -86,4 +112,29 @@ var _ = Describe("KCP cluster-aware informer cache", func() {
 		By("By getting the default namespace with the informer, but cluster-aware key should succeed")
 		err = c.Get(kontext.WithCluster(ctx, "cluster1"), client.ObjectKey{Name: "default", Namespace: "cluster1"}, ns)
 	})
+
+	It("should support indexes with cluster-aware keys", func() {
+		ctx, cancel := context.WithCancel(context.Background())
+		defer cancel()
+
+		c, err := cache.New(cfg, cache.Options{})
+		Expect(err).NotTo(HaveOccurred())
+
+		By("Indexing the default namespace by name")
+		err = c.IndexField(ctx, &corev1.Namespace{}, "my-name", func(obj client.Object) []string {
+			return []string{"my-key-" + obj.GetName()}
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		go c.Start(ctx) //nolint:errcheck // Start is blocking, and error not relevant here.
+		c.WaitForCacheSync(ctx)
+
+		By("By getting the default namespace via the custom index")
+		nss := &corev1.NamespaceList{}
+		err = c.List(ctx, nss, client.MatchingFieldsSelector{
+			Selector: fields.OneTermEqualSelector("my-name", "my-key-default"),
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(nss.Items).To(HaveLen(1))
+	})
 })