From 8ee9d15506175785f1018ecc9984add76ba9055a Mon Sep 17 00:00:00 2001
From: Madhu Rajanna <madhupr007@gmail.com>
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 <madhupr007@gmail.com>
---
 internal/util/csiconfig.go | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/internal/util/csiconfig.go b/internal/util/csiconfig.go
index 48a2e09c1fe4..7e9f4dcc0fcc 100644
--- a/internal/util/csiconfig.go
+++ b/internal/util/csiconfig.go
@@ -39,11 +39,8 @@ const (
 // ClusterInfo strongly typed JSON spec for the below JSON structure.
 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"`
+	ClusterID string   `json:"clusterID"`
+	Monitors  []string `json:"monitors"`
 	// CephFS contains CephFS specific options
 	CephFS struct {
 		// symlink filepath for the network namespace where we need to execute commands.
@@ -130,11 +127,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".