From 700d28097139de53c95d5bcbe43e8d80322bc254 Mon Sep 17 00:00:00 2001 From: Nizamudeen Date: Tue, 7 Jan 2020 12:04:34 +0530 Subject: [PATCH] edgeFS: Took care of the Variable shadowing in ConfigMap This commit fixes the variable shadowing in configMap which leads to a potential misconfiguration. Resolves: https://github.com/rook/rook/issues/4563 Signed-off-by: Nizamudeen --- pkg/operator/edgefs/cluster/configmap.go | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkg/operator/edgefs/cluster/configmap.go b/pkg/operator/edgefs/cluster/configmap.go index fa6c0a681..4ad26811f 100644 --- a/pkg/operator/edgefs/cluster/configmap.go +++ b/pkg/operator/edgefs/cluster/configmap.go @@ -38,14 +38,13 @@ const ( // to all the nodes in the cluster. This way configuration is simplified and // available to all subcomponents at any point it time. func (c *cluster) createClusterConfigMap(deploymentConfig edgefsv1.ClusterDeploymentConfig, resurrect bool) error { - + var err error cm := make(map[string]edgefsv1.SetupNode) dnsRecords := make([]string, len(deploymentConfig.DevConfig)) for i := 0; i < len(deploymentConfig.DevConfig); i++ { dnsRecords[i] = target.CreateQualifiedHeadlessServiceName(i, c.Namespace) } - serverIfName := defaultServerIfName brokerIfName := defaultBrokerIfName @@ -65,7 +64,6 @@ func (c *cluster) createClusterConfigMap(deploymentConfig edgefsv1.ClusterDeploy } } else if c.Spec.Network.IsMultus() { if serverDefined && brokerDefined { - var err error serverIfName, err = k8sutil.GetMultusIfName(serverSelector) if err != nil { return err @@ -76,14 +74,14 @@ func (c *cluster) createClusterConfigMap(deploymentConfig edgefsv1.ClusterDeploy return err } } else if serverDefined { - serverIfName, err := k8sutil.GetMultusIfName(serverSelector) + serverIfName, err = k8sutil.GetMultusIfName(serverSelector) if err != nil { return err } brokerIfName = serverIfName } else if brokerDefined { - serverIfName, err := k8sutil.GetMultusIfName(brokerSelector) + serverIfName, err = k8sutil.GetMultusIfName(brokerSelector) if err != nil { return err }