From b3cd67f871743abdaa11d07702e1ca6043854c0f Mon Sep 17 00:00:00 2001 From: "xiaorui.zou" Date: Mon, 10 Jun 2019 12:53:24 +0800 Subject: [PATCH] Fix onDelete func panic onDelete obj in some case will return DeletedFinalStateUnknown type, we need use assert. Signed-off-by: xiaorui.zou --- pkg/operator/cockroachdb/controller.go | 6 +++++- pkg/operator/edgefs/cluster/controller.go | 7 +++++-- pkg/operator/minio/controller.go | 6 +++++- pkg/operator/nfs/controller.go | 6 +++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/pkg/operator/cockroachdb/controller.go b/pkg/operator/cockroachdb/controller.go index e19ff2206..ec5a75e63 100644 --- a/pkg/operator/cockroachdb/controller.go +++ b/pkg/operator/cockroachdb/controller.go @@ -187,7 +187,11 @@ func (c *ClusterController) onUpdate(oldObj, newObj interface{}) { } func (c *ClusterController) onDelete(obj interface{}) { - cluster := obj.(*cockroachdbv1alpha1.Cluster).DeepCopy() + cluster, ok := obj.(*cockroachdbv1alpha1.Cluster) + if !ok { + return + } + cluster = cluster.DeepCopy() logger.Infof("cluster %s deleted from namespace %s", cluster.Name, cluster.Namespace) } diff --git a/pkg/operator/edgefs/cluster/controller.go b/pkg/operator/edgefs/cluster/controller.go index 948c017bf..d7abf2860 100644 --- a/pkg/operator/edgefs/cluster/controller.go +++ b/pkg/operator/edgefs/cluster/controller.go @@ -322,8 +322,11 @@ func (c *ClusterController) handleUpdate(newClust *edgefsv1beta1.Cluster, cluste } func (c *ClusterController) onDelete(obj interface{}) { - clust := obj.(*edgefsv1beta1.Cluster).DeepCopy() - + clust, ok := obj.(*edgefsv1beta1.Cluster) + if !ok { + return + } + clust = clust.DeepCopy() logger.Infof("delete event for cluster %s in namespace %s", clust.Name, clust.Namespace) err := c.handleDelete(clust, time.Duration(clusterDeleteRetryInterval)*time.Second) diff --git a/pkg/operator/minio/controller.go b/pkg/operator/minio/controller.go index 10a99692b..34ae778f5 100644 --- a/pkg/operator/minio/controller.go +++ b/pkg/operator/minio/controller.go @@ -352,7 +352,11 @@ func (c *Controller) onUpdate(oldObj, newObj interface{}) { } func (c *Controller) onDelete(obj interface{}) { - objectstore := obj.(*miniov1alpha1.ObjectStore).DeepCopy() + objectstore, ok := obj.(*miniov1alpha1.ObjectStore) + if !ok { + return + } + objectstore = objectstore.DeepCopy() logger.Infof("Delete Minio object store %s", objectstore.Name) // Cleanup is handled by the owner references set in 'onAdd' and the k8s garbage collector. diff --git a/pkg/operator/nfs/controller.go b/pkg/operator/nfs/controller.go index 3d6e6609e..4dea22390 100644 --- a/pkg/operator/nfs/controller.go +++ b/pkg/operator/nfs/controller.go @@ -436,7 +436,11 @@ func (c *Controller) onUpdate(oldObj, newObj interface{}) { } func (c *Controller) onDelete(obj interface{}) { - cluster := obj.(*nfsv1alpha1.NFSServer).DeepCopy() + cluster, ok := obj.(*nfsv1alpha1.NFSServer) + if !ok { + return + } + cluster = cluster.DeepCopy() logger.Infof("cluster %s deleted from namespace %s", cluster.Name, cluster.Namespace) }