Merge pull request #10648 from DirectXMan12/bug/idling-cache-deleted

Merged by openshift-bot

Author: OpenShift Bot

pkg/cmd/cli/cmd/idle.go

@@ -548,7 +548,7 @@ func (o *IdleOptions) RunIdle(f *clientcmd.Factory) error {
 	for scaleRef, svcName := range byScalable {
 		obj, scale, err := scaleAnnotater.GetObjectWithScale(svcName.Namespace, scaleRef)
 		if err != nil {
-			fmt.Fprintf(o.errOut, "error: unable to get scale for %s %s/%s, not marking that scalable as idled\n", scaleRef.Kind, svcName.Namespace, scaleRef.Name)
+			fmt.Fprintf(o.errOut, "error: unable to get scale for %s %s/%s, not marking that scalable as idled: %v\n", scaleRef.Kind, svcName.Namespace, scaleRef.Name, err)
 			svcInfo := byService[svcName]
 			delete(svcInfo.scaleRefs, scaleRef)
 			hadError = true
@@ -625,7 +625,7 @@ func (o *IdleOptions) RunIdle(f *clientcmd.Factory) error {
 		if !o.dryRun {
 			info.scale.Spec.Replicas = 0
 			if err := scaleAnnotater.UpdateObjectScale(info.namespace, scaleRef, info.obj, info.scale); err != nil {
-				fmt.Fprintf(o.errOut, "error: unable to scale %s %s/%s to 0, but still listed as target for unidling\n", scaleRef.Kind, info.namespace, scaleRef.Name)
+				fmt.Fprintf(o.errOut, "error: unable to scale %s %s/%s to 0, but still listed as target for unidling: %v\n", scaleRef.Kind, info.namespace, scaleRef.Name, err)
 				hadError = true
 				continue
 			}

pkg/unidling/controller/controller.go

@@ -104,20 +104,10 @@ func NewUnidlingController(scaleNS kextclient.ScalesGetter, endptsNS kclient.End
 		&kapi.Event{},
 		resyncPeriod,
 		framework.ResourceEventHandlerFuncs{
-			AddFunc: func(obj interface{}) {
-				event := obj.(*kapi.Event)
-				unidlingController.enqueueEvent(event)
-			},
-			UpdateFunc: func(oldObj interface{}, newObj interface{}) {
-				// retrigger on new last-seen times
-				event := newObj.(*kapi.Event)
-				unidlingController.enqueueEvent(event)
-			},
-			DeleteFunc: func(obj interface{}) {
-				// this is just to clean up our cache of the last seen times
-				event := obj.(*kapi.Event)
-				unidlingController.clearEventFromCache(event)
-			},
+			AddFunc:    unidlingController.addEvent,
+			UpdateFunc: unidlingController.updateEvent,
+			// this is just to clean up our cache of the last seen times
+			DeleteFunc: unidlingController.checkAndClearFromCache,
 		},
 	)
 
@@ -126,6 +116,45 @@ func NewUnidlingController(scaleNS kextclient.ScalesGetter, endptsNS kclient.End
 	return unidlingController
 }
 
+func (c *UnidlingController) addEvent(obj interface{}) {
+	evt, ok := obj.(*kapi.Event)
+	if !ok {
+		utilruntime.HandleError(fmt.Errorf("got non-Event object in event action: %v", obj))
+		return
+	}
+
+	c.enqueueEvent(evt)
+}
+
+func (c *UnidlingController) updateEvent(oldObj, newObj interface{}) {
+	evt, ok := newObj.(*kapi.Event)
+	if !ok {
+		utilruntime.HandleError(fmt.Errorf("got non-Event object in event action: %v", newObj))
+		return
+	}
+
+	c.enqueueEvent(evt)
+}
+
+func (c *UnidlingController) checkAndClearFromCache(obj interface{}) {
+	evt, objIsEvent := obj.(*kapi.Event)
+	if !objIsEvent {
+		tombstone, objIsTombstone := obj.(cache.DeletedFinalStateUnknown)
+		if !objIsTombstone {
+			utilruntime.HandleError(fmt.Errorf("got non-event, non-tombstone object in event action: %v", obj))
+			return
+		}
+
+		evt, objIsEvent = tombstone.Obj.(*kapi.Event)
+		if !objIsEvent {
+			utilruntime.HandleError(fmt.Errorf("tombstone contained object that is not an Event in event action: %v", obj))
+			return
+		}
+	}
+
+	c.clearEventFromCache(evt)
+}
+
 // clearEventFromCache removes the entry for the given event from the lastFiredCache.
 func (c *UnidlingController) clearEventFromCache(event *kapi.Event) {
 	if event.Reason != unidlingapi.NeedPodsReason {