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 <[email protected]>
ceph · Nov 3, 2023 · 8ee9d15 · 8ee9d15
1 parent 29f6421
commit 8ee9d15
Showing 1 changed file with 3 additions and 10 deletions.
diff --git 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".