more small fixes

Signed-off-by: Per Goncalves da Silva <[email protected]>

Author: Per Goncalves da Silva

pkg/lib/queueinformer/queueinformer.go

@@ -2,6 +2,7 @@ package queueinformer
 
 import (
 	"context"
+	"fmt"
 
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
@@ -43,21 +44,25 @@ func (q *QueueInformer) Enqueue(event kubestate.ResourceEvent) {
 		return
 	}
 
-	resource := event.Resource()
+	e := event
 
 	// Delete operations should always carry either something assignable to
 	// metev1.Object or cache.DeletedFinalStateUnknown.
 	// Add/Update events coming from the informer should have their resource
 	// converted to a key (string) before being enqueued.
 	if event.Type() != kubestate.ResourceDeleted {
 		// Extract key for add and update events
-		if key, ok := q.key(resource); ok {
-			resource = key
+		if key, ok := q.key(e.Resource()); ok {
+			e = kubestate.NewResourceEvent(event.Type(), key)
+		} else {
+			// if the resource cannot be keyed the worker will not be able to process it
+			// since it will not be able to retrieve the resource
+			q.logger.WithField("event", e).Warn(fmt.Sprintf("resource of type %T is not keyable - skipping enqueue", e.Resource()))
+			return
 		}
 	}
 
 	// Create new resource event and add to queue
-	e := kubestate.NewResourceEvent(event.Type(), resource)
 	q.logger.WithField("event", e).Trace("enqueuing resource event")
 	q.queue.Add(e)
 }

pkg/lib/queueinformer/queueinformer_operator.go

@@ -284,25 +284,20 @@ func (o *operator) processNextWorkItem(ctx context.Context, loop *QueueInformer)
 		}
 
 		logger = logger.WithField("cache-key", key)
-
-		var resource interface{}
-		if loop.indexer == nil {
-			resource = item.Resource()
-		} else {
-			// Get the current cached version of the resource
-			var exists bool
-			var err error
-			resource, exists, err = loop.indexer.GetByKey(key)
-			if err != nil {
-				logger.WithError(err).Error("cache get failed")
-				queue.Forget(item)
-				return true
-			}
-			if !exists {
-				logger.WithField("existing-cache-keys", loop.indexer.ListKeys()).Debug("cache get failed, key not in cache")
-				queue.Forget(item)
-				return true
-			}
+		
+		// Get the current cached version of the resource
+		var exists bool
+		var err error
+		resource, exists, err := loop.indexer.GetByKey(key)
+		if err != nil {
+			logger.WithError(err).Error("cache get failed")
+			queue.Forget(item)
+			return true
+		}
+		if !exists {
+			logger.WithField("existing-cache-keys", loop.indexer.ListKeys()).Debug("cache get failed, key not in cache")
+			queue.Forget(item)
+			return true
 		}
 		event = kubestate.NewResourceEvent(item.Type(), resource)
 	}