Revert "Refactor dyamic cache to use namespaced informers"

Signed-off-by: Sam Foo <[email protected]>
vmware-archive · Jun 16, 2021 · e3252fc · e3252fc
1 parent b803286
commit e3252fc
Show file tree

Hide file tree

Showing 11 changed files with 212 additions and 191 deletions.
diff --git a/internal/cluster/cluster.go b/internal/cluster/cluster.go
@@ -54,7 +54,7 @@ import (
 type ClientInterface interface {
  DefaultNamespace() string
  ResourceExists(schema.GroupVersionResource) bool
- Resource(schema.GroupVersionKind) (schema.GroupVersionResource, bool, error)
+ Resource(schema.GroupKind) (schema.GroupVersionResource, bool, error)
  ResetMapper()
  KubernetesClient() (kubernetes.Interface, error)
  DynamicClient() (dynamic.Interface, error)
@@ -169,8 +169,8 @@ func (c *Cluster) ResourceExists(gvr schema.GroupVersionResource) bool {
  return err == nil
 }
 
-func (c *Cluster) Resource(gvk schema.GroupVersionKind) (schema.GroupVersionResource, bool, error) {
- restMapping, err := c.restMapper.RESTMapping(gvk.GroupKind(), gvk.Version)
+func (c *Cluster) Resource(gk schema.GroupKind) (schema.GroupVersionResource, bool, error) {
+ restMapping, err := c.restMapper.RESTMapping(gk)
  if err != nil {
  return schema.GroupVersionResource{}, false, err
  }

diff --git a/internal/cluster/fake/mock_client_interface.go b/internal/cluster/fake/mock_client_interface.go
diff --git a/internal/describer/crd_watcher.go b/internal/describer/crd_watcher.go
@@ -37,7 +37,7 @@ type DefaultCRDWatcher struct {
 var _ config.CRDWatcher = (*DefaultCRDWatcher)(nil)
 
 // NewDefaultCRDWatcher creates an instance of DefaultCRDWatcher.
-func NewDefaultCRDWatcher(_ context.Context, clusterClient cluster.ClientInterface, objectStore store.Store, errorStore oerrors.ErrorStore) (*DefaultCRDWatcher, error) {
+func NewDefaultCRDWatcher(ctx context.Context, clusterClient cluster.ClientInterface, objectStore store.Store, errorStore oerrors.ErrorStore) (*DefaultCRDWatcher, error) {
  if objectStore == nil {
  return nil, errors.New("object store is nil")
  }
@@ -62,6 +62,7 @@ var (
 // Watch watches for CRDs given a configuration.
 func (cw *DefaultCRDWatcher) Watch(ctx context.Context) error {
  logger := log.From(ctx)
+
  handler := &kcache.ResourceEventHandlerFuncs{
  AddFunc: func(object interface{}) {
  cw.mu.Lock()

diff --git a/internal/describer/describer.go b/internal/describer/describer.go
@@ -82,6 +82,7 @@ func LoadObjects(ctx context.Context, objectStore store.Store, errorStore oerror
  if name, ok := fields["name"]; ok && name != "" {
  objectStoreKey.Name = name
  }
+
  storedObjects, _, err := objectStore.List(ctx, objectStoreKey)
  if err != nil {
  var ae *oerrors.AccessError