From b45887faee832dc96c35ff62b77c3aaa4210b2d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Wed, 8 Dec 2021 11:22:58 +0100 Subject: [PATCH] core: always return nil on error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We should always return a nil pointer of clusterInfo if CreateOrLoadClusterInfo() returns an error. Closes: https://github.com/rook/rook/issues/9314 Signed-off-by: Sébastien Han --- pkg/operator/ceph/cluster/mon/config.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/operator/ceph/cluster/mon/config.go b/pkg/operator/ceph/cluster/mon/config.go index 831dc6411b918..b9feb3ea9d502 100644 --- a/pkg/operator/ceph/cluster/mon/config.go +++ b/pkg/operator/ceph/cluster/mon/config.go @@ -155,7 +155,7 @@ func CreateOrLoadClusterInfo(clusterdContext *clusterd.Context, context context. if clusterInfo.CephCred.Secret == adminSecretNameKey { secret, err := clusterdContext.Clientset.CoreV1().Secrets(namespace).Get(context, OperatorCreds, metav1.GetOptions{}) if err != nil { - return clusterInfo, maxMonID, monMapping, err + return nil, maxMonID, monMapping, err } // Populate external credential clusterInfo.CephCred.Username = string(secret.Data["userID"]) @@ -163,7 +163,7 @@ func CreateOrLoadClusterInfo(clusterdContext *clusterd.Context, context context. } if err := ValidateCephCSIConnectionSecrets(clusterdContext, namespace); err != nil { - return clusterInfo, maxMonID, monMapping, err + return nil, maxMonID, monMapping, err } return clusterInfo, maxMonID, monMapping, nil