fix(reflection): handle errors when getting metadata accessor

Author: aleoli

internal/crdReplicator/reflection/reflector.go

@@ -247,15 +247,29 @@ func (r *Reflector) get(gvr schema.GroupVersionResource) (*reflectedResource, bo
 func (r *Reflector) eventHandlers(gvr schema.GroupVersionResource) cache.ResourceEventHandlerFuncs {
 	eh := func(obj interface{}) {
 		metadata, err := meta.Accessor(obj)
-		utilruntime.Must(err)
+		if err != nil {
+			klog.Errorf("[%v] Failed to get metadata accessor for %v event handler: obj=%T, err=%v", r.remoteClusterID, gvr, obj, err)
+			return
+		}
 
 		r.workqueue.Add(item{gvr: gvr, name: metadata.GetName()})
 	}
 
+	ehDelete := func(obj interface{}) {
+		// Delete events may come wrapped in a tombstone; unwrap it if needed.
+		switch tombstone := obj.(type) {
+		case cache.DeletedFinalStateUnknown:
+			obj = tombstone.Obj
+		case *cache.DeletedFinalStateUnknown:
+			obj = tombstone.Obj
+		}
+		eh(obj)
+	}
+
 	return cache.ResourceEventHandlerFuncs{
 		AddFunc:    eh,
 		UpdateFunc: func(_, obj interface{}) { eh(obj) },
-		DeleteFunc: eh,
+		DeleteFunc: ehDelete,
 	}
 }
 

pkg/virtualKubelet/reflection/generic/reflector.go

@@ -25,7 +25,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/types"
-	utilruntime "k8s.io/apimachinery/pkg/util/runtime"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/apimachinery/pkg/watch"
 	"k8s.io/client-go/tools/cache"
@@ -303,8 +302,24 @@ func (gr *reflector) handle(ctx context.Context, key types.NamespacedName) error
 // handle dispatches the items to be reconciled based on the resource type and namespace.
 func (gr *reflector) handlers(keyer options.Keyer, filters ...options.EventFilter) cache.ResourceEventHandler {
 	eh := func(ev watch.EventType, obj interface{}) {
+		// Unwrap tombstones for delete events. Informers may pass a
+		// cache.DeletedFinalStateUnknown containing the last known object.
+		if ev == watch.Deleted {
+			switch tombstone := obj.(type) {
+			case cache.DeletedFinalStateUnknown:
+				obj = tombstone.Obj
+			case *cache.DeletedFinalStateUnknown:
+				obj = tombstone.Obj
+			}
+		}
+
 		metadata, err := meta.Accessor(obj)
-		utilruntime.Must(err)
+		if err != nil {
+			// Do not panic: just log and skip this event.
+			klog.Errorf("Failed to get metadata accessor in %v reflector for event %q: obj=%T, err=%v",
+				gr.name, ev, obj, err)
+			return
+		}
 
 		for _, filter := range filters {
 			if filter(ev) {