From b6a8a094ce1c265e417b4a04f008d3d1102a233b Mon Sep 17 00:00:00 2001 From: Umanga Chapagain Date: Sat, 4 Apr 2020 13:56:57 +0530 Subject: [PATCH] Cockroachdb: fixes unhandled type assertions unhandled type assertions can lead to runtime panic. using the boolean 'ok' flag to handle failure to assert type. Issue: #4566 Signed-off-by: Umanga Chapagain --- pkg/operator/cockroachdb/controller.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkg/operator/cockroachdb/controller.go b/pkg/operator/cockroachdb/controller.go index 56dde82af..2a1a90e68 100644 --- a/pkg/operator/cockroachdb/controller.go +++ b/pkg/operator/cockroachdb/controller.go @@ -123,7 +123,11 @@ func (c *ClusterController) StartWatch(namespace string, stopCh chan struct{}) { } func (c *ClusterController) onAdd(obj interface{}) { - clusterObj := obj.(*cockroachdbv1alpha1.Cluster).DeepCopy() + clusterObj, ok := obj.(*cockroachdbv1alpha1.Cluster) + if !ok { + return + } + clusterObj = clusterObj.DeepCopy() logger.Infof("new cluster %s added to namespace %s", clusterObj.Name, clusterObj.Namespace) cluster := newCluster(clusterObj, c.context) @@ -176,8 +180,16 @@ func (c *ClusterController) onAdd(obj interface{}) { } func (c *ClusterController) onUpdate(oldObj, newObj interface{}) { - _ = oldObj.(*cockroachdbv1alpha1.Cluster).DeepCopy() - newCluster := newObj.(*cockroachdbv1alpha1.Cluster).DeepCopy() + oldCluster, ok := oldObj.(*cockroachdbv1alpha1.Cluster) + if !ok { + return + } + _ = oldCluster.DeepCopy() + newCluster, ok := newObj.(*cockroachdbv1alpha1.Cluster) + if !ok { + return + } + newCluster = newCluster.DeepCopy() logger.Infof("cluster %s updated in namespace %s", newCluster.Name, newCluster.Namespace) }