Merge pull request #16882 from parth-gr/fix-external-admin

external: if admin creds is provided stop creating csi secret
This commit is contained in:
Parth Arora authored and GitHub committed 2026-01-12 19:53:06 +05:30
commit 06ee0db7a2
3 files changed
+10 -14

No files matched your search

+4
View File
@@ -6,6 +6,10 @@
When set to `false`, the standby MDS daemon deployment will be scaled down and removed,
rather than only disabling the standby cache while the daemon remains running.
- Now rook operator won't create the csi user and secrets for external mode when admin keyring is used.
There will be a single source of truth. The python script will be responsible for creating the ceph user
and the import script will handle creating the kubernetes secrets for ceph user. [PR](https://github.com/rook/rook/pull/16882)
## Features
- Experimental: Allow concurrent reconciles of the CephCluster CR when there multiple clusters
@@ -1863,8 +1863,7 @@ class RadosJSON:
},
}
)
# if 'CSI_RBD_NODE_SECRET' exists, then only add 'rook-csi-rbd-provisioner' Secret
# if 'CSI_RBD_NODE_SECRET' && 'CSI_RBD_NODE_SECRET_NAME' exists, then only add 'rook-csi-rbd-node' Secret
if (
self.out_map["CSI_RBD_NODE_SECRET"]
and self.out_map["CSI_RBD_NODE_SECRET_NAME"]
@@ -1881,7 +1880,7 @@ class RadosJSON:
},
}
)
# if 'CSI_RBD_PROVISIONER_SECRET' exists, then only add 'rook-csi-rbd-provisioner' Secret
# if 'CSI_RBD_PROVISIONER_SECRET' && 'CSI_RBD_PROVISIONER_SECRET_NAME' exists, then only add 'rook-csi-rbd-provisioner' Secret
if (
self.out_map["CSI_RBD_PROVISIONER_SECRET"]
and self.out_map["CSI_RBD_PROVISIONER_SECRET_NAME"]
@@ -1892,13 +1891,14 @@ class RadosJSON:
"kind": "Secret",
"data": {
"userID": self.get_user_id(
self.out_map["CSI_RBD_PROVISIONER_SECRET_NAME"], generation
self.out_map["CSI_RBD_PROVISIONER_SECRET_NAME"],
generation,
),
"userKey": self.out_map["CSI_RBD_PROVISIONER_SECRET"],
},
}
)
# if 'CSI_CEPHFS_PROVISIONER_SECRET' exists, then only add 'rook-csi-cephfs-provisioner' Secret
# if 'CSI_CEPHFS_PROVISIONER_SECRET' && 'CSI_CEPHFS_PROVISIONER_SECRET_NAME' exists, then only add 'rook-csi-cephfs-provisioner' Secret
if (
self.out_map["CSI_CEPHFS_PROVISIONER_SECRET"]
and self.out_map["CSI_CEPHFS_PROVISIONER_SECRET_NAME"]
@@ -1916,7 +1916,7 @@ class RadosJSON:
},
}
)
# if 'CSI_CEPHFS_NODE_SECRET' exists, then only add 'rook-csi-cephfs-node' Secret
# if 'CSI_CEPHFS_NODE_SECRET' && 'CSI_CEPHFS_NODE_SECRET_NAME' exists, then only add 'rook-csi-cephfs-node' Secret
if (
self.out_map["CSI_CEPHFS_NODE_SECRET"]
and self.out_map["CSI_CEPHFS_NODE_SECRET_NAME"]
@@ -101,14 +101,6 @@ func (c *ClusterController) configureExternalCephCluster(cluster *cluster) error
}
log.NamespacedInfo(cluster.Namespace, logger, "external cluster identity established")
// Create CSI Secrets only if the user has provided the admin key
if cluster.ClusterInfo.CephCred.Username == client.AdminUsername {
err = csi.CreateCSISecrets(c.context, cluster.ClusterInfo, cluster.namespacedName)
if err != nil {
return errors.Wrap(err, "failed to create csi kubernetes secrets")
}
}
// update the msgr2 flag
for _, m := range cluster.ClusterInfo.InternalMonitors {
// m.Endpoint=10.1.115.104:3300