From 1e05a0da7c71cc78ea04a171ef0cc7f20fddee9b Mon Sep 17 00:00:00 2001 From: Madhu Rajanna Date: Fri, 3 Nov 2023 09:45:30 +0100 Subject: [PATCH] util: remove RadosNamespace from configmap remove RadosNamespace from the configmap main section as its already added to the rbd section Signed-off-by: Madhu Rajanna --- internal/util/csiconfig.go | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/internal/util/csiconfig.go b/internal/util/csiconfig.go index 48a2e09c1..b39ce241d 100644 --- a/internal/util/csiconfig.go +++ b/internal/util/csiconfig.go @@ -40,8 +40,6 @@ const ( type ClusterInfo struct { // ClusterID is used for unique identification ClusterID string `json:"clusterID"` - // RadosNamespace is a rados namespace in the pool - RadosNamespace string `json:"radosNamespace"` // For backward compatibility. TODO: Remove this in 3.7.0 // Monitors is monitor list for corresponding cluster ID Monitors []string `json:"monitors"` // CephFS contains CephFS specific options @@ -130,11 +128,7 @@ func GetRadosNamespace(pathToConfig, clusterID string) (string, error) { return "", err } - if cluster.RBD.RadosNamespace != "" { - return cluster.RBD.RadosNamespace, nil - } - - return cluster.RadosNamespace, nil + return cluster.RBD.RadosNamespace, nil } // CephFSSubvolumeGroup returns the subvolumeGroup for CephFS volumes. If not set, it returns the default value "csi".