Fix onDelete func panic

onDelete obj in some case will return DeletedFinalStateUnknown type, we need use assert.

Signed-off-by: xiaorui.zou <xiaorui.zou@gmail.com>
This commit is contained in:
xiaorui.zou committed 2019-06-13 09:31:53 +08:00
1 parent f2c49ea034
commit b3cd67f871
4 files changed
+20 -5

No files matched your search

+5 -1
View File
@@ -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)
}
+5 -2
View File
@@ -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)
+5 -1
View File
@@ -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.
+5 -1
View File
@@ -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)
}