From d361b4ca1be6311ecaeac15537b758bb75a12ebd Mon Sep 17 00:00:00 2001 From: travisn Date: Wed, 10 May 2023 17:25:45 -0600 Subject: [PATCH] docs: remove obsolete comments about old versions Remove old mentions of rook or ceph versions that are no longer relevant. Signed-off-by: travisn (cherry picked from commit 0f6b09940383b37aa6278e699e10faad6399ce77) --- .../CRDs/Object-Storage/ceph-object-store-user-crd.md | 4 ++-- pkg/operator/ceph/cluster/cluster_external.go | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Documentation/CRDs/Object-Storage/ceph-object-store-user-crd.md b/Documentation/CRDs/Object-Storage/ceph-object-store-user-crd.md index 7184d73e9..3cb100f9f 100644 --- a/Documentation/CRDs/Object-Storage/ceph-object-store-user-crd.md +++ b/Documentation/CRDs/Object-Storage/ceph-object-store-user-crd.md @@ -36,11 +36,11 @@ spec: * `store`: The object store in which the user will be created. This matches the name of the objectstore CRD. * `displayName`: The display name which will be passed to the `radosgw-admin user create` command. -* `quotas`: This represents quota limitation can be set on the user (support added in Rook v1.7.3 and up). Please refer [here](https://docs.ceph.com/en/latest/radosgw/admin/#quota-management) for details. +* `quotas`: This represents quota limitation can be set on the user. Please refer [here](https://docs.ceph.com/en/latest/radosgw/admin/#quota-management) for details. * `maxBuckets`: The maximum bucket limit for the user. * `maxSize`: Maximum size limit of all objects across all the user's buckets. * `maxObjects`: Maximum number of objects across all the user's buckets. -* `capabilities`: Ceph allows users to be given additional permissions (support added in Rook v1.7.3 and up). Due to missing APIs in go-ceph for updating the user capabilities, this setting can currently only be used during the creation of the object store user. If a user's capabilities need modified, the user must be deleted and re-created. +* `capabilities`: Ceph allows users to be given additional permissions. Due to missing APIs in go-ceph for updating the user capabilities, this setting can currently only be used during the creation of the object store user. If a user's capabilities need modified, the user must be deleted and re-created. See the [Ceph docs](https://docs.ceph.com/en/latest/radosgw/admin/#add-remove-admin-capabilities) for more info. Rook supports adding `read`, `write`, `read, write`, or `*` permissions for the following resources: * `users` diff --git a/pkg/operator/ceph/cluster/cluster_external.go b/pkg/operator/ceph/cluster/cluster_external.go index c21e7f191..fbc1c2141 100644 --- a/pkg/operator/ceph/cluster/cluster_external.go +++ b/pkg/operator/ceph/cluster/cluster_external.go @@ -121,7 +121,6 @@ func (c *ClusterController) configureExternalCephCluster(cluster *cluster) error logger.Info("successfully updated csi config map") // Create Crash Collector Secret - // In 14.2.5 the crash daemon will read the client.crash key instead of the admin key if !cluster.Spec.CrashCollector.Disable { err = nodedaemon.CreateCrashCollectorSecret(c.context, cluster.ClusterInfo) if err != nil {