Drop use of kcp-dev fork of kubernetes #13
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,8 @@ import ( | |
| "sigs.k8s.io/controller-runtime/pkg/client" | ||
| ) | ||
|
|
||
| // TODO(KCP) need to implement and plumb through our own cache reader | ||
|
|
||
| // CacheReader is a client.Reader. | ||
| var _ client.Reader = &CacheReader{} | ||
|
|
||
|
|
@@ -57,11 +59,11 @@ type CacheReader struct { | |
| } | ||
|
|
||
| // Get checks the indexer for the object and writes a copy of it if found. | ||
| func (c *CacheReader) Get(ctx context.Context, key client.ObjectKey, out client.Object) error { | ||
| if c.scopeName == apimeta.RESTScopeNameRoot { | ||
| key.Namespace = "" | ||
| } | ||
| storeKey := objectKeyToStoreKey(ctx, key) | ||
|
|
||
| // Lookup the object from the indexer cache | ||
| obj, exists, err := c.indexer.GetByKey(storeKey) | ||
|
|
@@ -137,12 +139,18 @@ func (c *CacheReader) List(ctx context.Context, out client.ObjectList, opts ...c | |
| // namespaced index key. Otherwise, ask for the non-namespaced variant by using the fake "all namespaces" | ||
| // namespace. | ||
| objs, err = c.indexer.ByIndex(FieldIndexName(field), KeyToNamespacedKey(listOpts.Namespace, val)) | ||
| case listOpts.Namespace != "": | ||
| if listOpts.Cluster.Empty() { | ||
| objs, err = c.indexer.ByIndex(cache.NamespaceIndex, listOpts.Namespace) | ||
| } else { | ||
| objs, err = c.indexer.ByIndex(kcpcache.ClusterAndNamespaceIndexName, kcpcache.ToClusterAwareKey(listOpts.Cluster.String(), listOpts.Namespace, "")) | ||
| } | ||
| default: | ||
| if listOpts.Cluster.Empty() { | ||
| objs = c.indexer.List() | ||
| } else { | ||
| objs, err = c.indexer.ByIndex(kcpcache.ClusterIndexName, kcpcache.ToClusterAwareKey(listOpts.Cluster.String(), "", "")) | ||
| } | ||
| } | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -194,8 +202,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(ctx context.Context, k client.ObjectKey) string { | ||
| cluster, ok := kcpclient.ClusterFromContext(ctx) | ||
| if ok { | ||
| return kcpcache.ToClusterAwareKey(cluster.String(), k.Namespace, k.Name) | ||
| } | ||
|
Comment on lines
+206
to
+209
There was a problem hiding this comment. This looks like it should support also the case when the context doesn't have the cluster set - in other words in a standard K8s/OpenShift environment. However, I'm afraid that it won't work if the cache reader still depends on the different keys. See the changes in my PR: #14 There was a problem hiding this comment. Yup, assuming this works, this should unblock me. |
||
|
|
||
| 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`. | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.