Merge pull request #16502 from rook/mergify/bp/release-1.17/pr-16496

core: fix ObjectZoneSpec.ZoneGroup and ObjectZoneGroupSpec.Realm field descriptions (backport #16496)
This commit is contained in:
mergify[bot] authored and GitHub committed 2025-09-17 12:20:38 +00:00
commit 757bb543e4
4 files changed
+15 -15

No files matched your search

+6 -6
View File
@@ -2120,7 +2120,7 @@ string
</td>
<td>
<em>(Optional)</em>
<p>The display name for the ceph users</p>
<p>The display name for the ceph user.</p>
</td>
</tr>
<tr>
@@ -2259,7 +2259,7 @@ string
</em>
</td>
<td>
<p>The display name for the ceph users</p>
<p>The name of the zone group the zone is a member of.</p>
</td>
</tr>
<tr>
@@ -2419,7 +2419,7 @@ string
</em>
</td>
<td>
<p>The display name for the ceph users</p>
<p>The name of the realm the zone group is a member of.</p>
</td>
</tr>
</table>
@@ -10681,7 +10681,7 @@ string
</td>
<td>
<em>(Optional)</em>
<p>The display name for the ceph users</p>
<p>The display name for the ceph user.</p>
</td>
</tr>
<tr>
@@ -11138,7 +11138,7 @@ string
</em>
</td>
<td>
<p>The display name for the ceph users</p>
<p>The name of the realm the zone group is a member of.</p>
</td>
</tr>
</tbody>
@@ -11167,7 +11167,7 @@ string
</em>
</td>
<td>
<p>The display name for the ceph users</p>
<p>The name of the zone group the zone is a member of.</p>
</td>
</tr>
<tr>
@@ -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
@@ -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
+3 -3
View File
@@ -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
@@ -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
+3 -3
View File
@@ -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"`
}
@@ -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