karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix: SearchController can't handle DeletedFinalStateUnknown it gets from controller framework 

Signed-off-by: xigang <wangxigang2014@gmail.com>
This commit is contained in:
xigang 2023-04-27 16:47:00 +08:00
parent 6c90cc3162
commit 929e66f06c
1 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
pkg/search/controller.go
View File

@ -331,7 +331,22 @@ func (c *Controller) updateResourceRegistry(oldObj, newObj interface{}) {
// deleteResourceRegistry parse the resourceRegistry object and add deleted Cluster to the queue
func (c *Controller) deleteResourceRegistry(obj interface{}) {
rr := obj.(*searchv1alpha1.ResourceRegistry)
rr, isRR := obj.(*searchv1alpha1.ResourceRegistry)
// We can get DeletedFinalStateUnknown instead of *searchv1alpha1.ResourceRegistry here and
// we need to handle that correctly.
if !isRR {
deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
klog.ErrorS(nil, "Received unpexpected object", "object", obj)
return
}
rr, ok = deletedState.Obj.(*searchv1alpha1.ResourceRegistry)
if !ok {
klog.ErrorS(nil, "DeletedFinalStateUnknown contained non-ResourceRegistry object", "object", deletedState.Obj)
return
}
}
for _, cluster := range c.getClusters(rr.Spec.TargetCluster) {
v, ok := c.clusterRegistry.Load(cluster)
if !ok {
@ -397,7 +412,22 @@ func (c *Controller) updateCluster(oldObj, curObj interface{}) {
// deleteCluster set cluster to not exists
func (c *Controller) deleteCluster(obj interface{}) {
cluster := obj.(*clusterV1alpha1.Cluster)
cluster, isCluster := obj.(*clusterV1alpha1.Cluster)
// We can get DeletedFinalStateUnknown instead of *clusterV1alpha1.Cluster here and
// we need to handle that correctly.
if !isCluster {
deletedState, ok := obj.(cache.DeletedFinalStateUnknown)
if !ok {
klog.ErrorS(nil, "Received unexpected object", "object", obj)
return
}
cluster, ok = deletedState.Obj.(*clusterV1alpha1.Cluster)
if !ok {
klog.ErrorS(nil, "DeletedFinalStateUnknown contained non-Cluster object", "object", deletedState.Obj)
return
}
}
_, ok := c.clusterRegistry.Load(cluster.GetName())
if !ok {
// unregistered cluster, do nothing.