From 5be20857689c13545061a5f4021117da32e22734 Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Tue, 16 Sep 2025 09:08:50 -0700 Subject: [PATCH 1/2] core: fix ObjectZoneGroupSpec.Realm field description Resolves this incorrect field description: ~ $ k explain cephobjectzonegroup.spec.realm GROUP: ceph.rook.io KIND: CephObjectZoneGroup VERSION: v1 FIELD: realm DESCRIPTION: The display name for the ceph users Signed-off-by: Joshua Hoblitt (cherry picked from commit 1a1478a34251840d47f151e76c8c21f49a91a790) --- Documentation/CRDs/specification.md | 8 ++++---- deploy/charts/rook-ceph/templates/resources.yaml | 4 ++-- deploy/examples/crds.yaml | 4 ++-- pkg/apis/ceph.rook.io/v1/types.go | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index fe70ba186..4102886bb 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -2120,7 +2120,7 @@ string (Optional) -

The display name for the ceph users

+

The display name for the ceph user.

@@ -2419,7 +2419,7 @@ string -

The display name for the ceph users

+

The name of the realm the zone group is a member of.

@@ -10681,7 +10681,7 @@ string (Optional) -

The display name for the ceph users

+

The display name for the ceph user.

@@ -11138,7 +11138,7 @@ string -

The display name for the ceph users

+

The name of the realm the zone group is a member of.

diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index b5db99099..12990ee7b 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -13367,7 +13367,7 @@ spec: description: The namespace where the parent CephCluster and CephObjectStore are found type: string displayName: - description: The display name for the ceph users + description: The display name for the ceph user. type: string keys: description: |- @@ -13549,7 +13549,7 @@ spec: description: ObjectZoneGroupSpec represent the spec of an ObjectZoneGroup properties: realm: - description: The display name for the ceph users + description: The name of the realm the zone group is a member of. type: string required: - realm diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index 6811f2802..856eb7402 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -13357,7 +13357,7 @@ spec: description: The namespace where the parent CephCluster and CephObjectStore are found type: string displayName: - description: The display name for the ceph users + description: The display name for the ceph user. type: string keys: description: |- @@ -13538,7 +13538,7 @@ spec: description: ObjectZoneGroupSpec represent the spec of an ObjectZoneGroup properties: realm: - description: The display name for the ceph users + description: The name of the realm the zone group is a member of. type: string required: - realm diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index 0b4638971..654767df8 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -2087,7 +2087,7 @@ type ObjectStoreUserSpec struct { // The store the user will be created in // +optional Store string `json:"store,omitempty"` - // The display name for the ceph users + // The display name for the ceph user. // +optional DisplayName string `json:"displayName,omitempty"` // +optional @@ -2268,7 +2268,7 @@ type CephObjectZoneGroupList struct { // ObjectZoneGroupSpec represent the spec of an ObjectZoneGroup type ObjectZoneGroupSpec struct { - // The display name for the ceph users + // The name of the realm the zone group is a member of. Realm string `json:"realm"` } From bd40cee69e17d85f29c9caa2379870e4560b265b Mon Sep 17 00:00:00 2001 From: Joshua Hoblitt Date: Tue, 16 Sep 2025 09:12:20 -0700 Subject: [PATCH 2/2] core: fix ObjectZoneSpec.ZoneGroup field description Resolves this incorrect field description: ~ $ k explain cephobjectzone.spec.zoneGroup GROUP: ceph.rook.io KIND: CephObjectZone VERSION: v1 FIELD: zoneGroup DESCRIPTION: The display name for the ceph users Signed-off-by: Joshua Hoblitt (cherry picked from commit 8b58d685926aaa5158f3a9b06768499c06b92f91) --- Documentation/CRDs/specification.md | 4 ++-- deploy/charts/rook-ceph/templates/resources.yaml | 2 +- deploy/examples/crds.yaml | 2 +- pkg/apis/ceph.rook.io/v1/types.go | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index 4102886bb..c7ea6234e 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -2259,7 +2259,7 @@ string -

The display name for the ceph users

+

The name of the zone group the zone is a member of.

@@ -11167,7 +11167,7 @@ string -

The display name for the ceph users

+

The name of the zone group the zone is a member of.

diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index 12990ee7b..ccf6f0d30 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -14133,7 +14133,7 @@ spec: type: boolean type: object zoneGroup: - description: The display name for the ceph users + description: The name of the zone group the zone is a member of. type: string required: - zoneGroup diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index 856eb7402..bcf8b09d5 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -14121,7 +14121,7 @@ spec: type: boolean type: object zoneGroup: - description: The display name for the ceph users + description: The name of the zone group the zone is a member of. type: string required: - zoneGroup diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index 654767df8..1d570b30c 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -2300,7 +2300,7 @@ type CephObjectZoneList struct { // ObjectZoneSpec represent the spec of an ObjectZone type ObjectZoneSpec struct { - // The display name for the ceph users + // The name of the zone group the zone is a member of. ZoneGroup string `json:"zoneGroup"` // The metadata pool settings