Merge pull request #253 from limhawjia/fix-deleted-final-state-unknown

fix(core): incorrect type assertion to *cache.DeletedFinalStateUnknown
kubewharf · Oct 26, 2023 · b21eb4f · b21eb4f
2 parents 94f1d20 + ebc57c5
commit b21eb4f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/pkg/controllers/federate/controller.go b/pkg/controllers/federate/controller.go
@@ -125,7 +125,7 @@ func NewFederateController(
 		Generator: func(ftc *fedcorev1a1.FederatedTypeConfig) cache.ResourceEventHandler {
 			return cache.FilteringResourceEventHandler{
 				FilterFunc: func(obj interface{}) bool {
-					if deleted, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
+					if deleted, ok := obj.(cache.DeletedFinalStateUnknown); ok {
 						obj = deleted.Obj
 					}
 					uns := obj.(*unstructured.Unstructured)
@@ -148,7 +148,7 @@ func NewFederateController(
 
 	if _, err := fedObjectInformer.Informer().AddEventHandler(cache.FilteringResourceEventHandler{
 		FilterFunc: func(obj interface{}) bool {
-			if deleted, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
+			if deleted, ok := obj.(cache.DeletedFinalStateUnknown); ok {
 				obj = deleted.Obj
 			}
 			fedObj := obj.(*fedcorev1a1.FederatedObject)

diff --git a/pkg/util/informermanager/federatedinformermanager.go b/pkg/util/informermanager/federatedinformermanager.go
@@ -510,7 +510,7 @@ func (m *federatedInformerManager) Start(ctx context.Context) {
 				}
 			},
 			DeleteFunc: func(obj interface{}) {
-				if deleted, ok := obj.(*cache.DeletedFinalStateUnknown); ok {
+				if deleted, ok := obj.(cache.DeletedFinalStateUnknown); ok {
 					obj = deleted.Obj
 					if obj == nil {
 						return