Skip to content

Ignore cluster in ctx for non-aware caches, and error for the inverse #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 11, 2024
Merged

Ignore cluster in ctx for non-aware caches, and error for the inverse #49

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a7c677
UPSTREAM: <squash>: ignore cluster in ctx for non-aware caches, and e…
sttts Mar 9, 2024
34979e8
Address comments
sttts Mar 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 23 additions & 16 deletions pkg/cache/internal/cache_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,17 @@ func (c *CacheReader) Get(ctx context.Context, key client.ObjectKey, out client.
if c.scopeName == apimeta.RESTScopeNameRoot {
key.Namespace = ""
}
storeKey := objectKeyToStoreKey(ctx, key)
storeKey := objectKeyToStoreKey(key)

// create cluster-aware key for KCP
_, isClusterAware := c.indexer.GetIndexers()[kcpcache.ClusterAndNamespaceIndexName]
clusterName, _ := kontext.ClusterFrom(ctx)
if isClusterAware && clusterName.Empty() {
return fmt.Errorf("cluster-aware cache requires a cluster in context")
}
if isClusterAware {
storeKey = clusterName.String() + "|" + storeKey
}

// Lookup the object from the indexer cache
obj, exists, err := c.indexer.GetByKey(storeKey)
Expand Down Expand Up @@ -120,6 +130,7 @@ func (c *CacheReader) List(ctx context.Context, out client.ObjectList, opts ...c
return fmt.Errorf("continue list option is not supported by the cache")
}

_, isClusterAware := c.indexer.GetIndexers()[kcpcache.ClusterAndNamespaceIndexName]
clusterName, _ := kontext.ClusterFrom(ctx)

switch {
Expand All @@ -133,16 +144,16 @@ func (c *CacheReader) List(ctx context.Context, out client.ObjectList, opts ...c
// namespace.
objs, err = byIndexes(c.indexer, listOpts.FieldSelector.Requirements(), clusterName, listOpts.Namespace)
case listOpts.Namespace != "":
if clusterName.Empty() {
objs, err = c.indexer.ByIndex(cache.NamespaceIndex, listOpts.Namespace)
} else {
if isClusterAware && !clusterName.Empty() {
objs, err = c.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ClusterAndNamespaceIndexKey(clusterName, listOpts.Namespace))
} else {
objs, err = c.indexer.ByIndex(cache.NamespaceIndex, listOpts.Namespace)
}
default:
if clusterName.Empty() {
objs = c.indexer.List()
} else {
if isClusterAware && !clusterName.Empty() {
objs, err = c.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ClusterIndexKey(clusterName))
} else {
objs = c.indexer.List()
}
}
if err != nil {
Expand Down Expand Up @@ -198,13 +209,14 @@ func byIndexes(indexer cache.Indexer, requires fields.Requirements, clusterName
vals []string
)
indexers := indexer.GetIndexers()
_, isClusterAware := indexers[kcpcache.ClusterAndNamespaceIndexName]
for idx, req := range requires {
indexName := FieldIndexName(req.Field)
var indexedValue string
if clusterName.Empty() {
indexedValue = KeyToNamespacedKey(namespace, req.Value)
} else {
if isClusterAware {
indexedValue = KeyToClusteredKey(clusterName.String(), namespace, req.Value)
} else {
indexedValue = KeyToNamespacedKey(namespace, req.Value)
}
if idx == 0 {
// we use first require to get snapshot data
Expand Down Expand Up @@ -248,12 +260,7 @@ func byIndexes(indexer cache.Indexer, requires fields.Requirements, clusterName
// It's akin to MetaNamespaceKeyFunc. It's separate from
// String to allow keeping the key format easily in sync with
// MetaNamespaceKeyFunc.
func objectKeyToStoreKey(ctx context.Context, k client.ObjectKey) string {
cluster, ok := kontext.ClusterFrom(ctx)
if ok {
return kcpcache.ToClusterAwareKey(cluster.String(), k.Namespace, k.Name)
}

func objectKeyToStoreKey(k client.ObjectKey) string {
if k.Namespace == "" {
return k.Name
}
Expand Down