From 809ae1cfba6d9db50e715987fe235e628a317251 Mon Sep 17 00:00:00 2001 From: parth-gr Date: Tue, 1 Apr 2025 18:03:52 +0530 Subject: [PATCH] object: updated cephobjectstore zone api if no multisite is used, rook creates the zone, in the same name as cephobjectstore cr, But cephobjectstore zone spec shows name as empty string("") Which is confusing for the end user, so to remove the confusion by updating the api defination Signed-off-by: parth-gr (cherry picked from commit c47c6c50727391384e8be10c1f65615cc1199e71) --- Documentation/CRDs/specification.md | 2 +- 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, 4 insertions(+), 4 deletions(-) diff --git a/Documentation/CRDs/specification.md b/Documentation/CRDs/specification.md index 26afc868f..ff24a4114 100644 --- a/Documentation/CRDs/specification.md +++ b/Documentation/CRDs/specification.md @@ -13747,7 +13747,7 @@ string -

RGW Zone the Object Store is in

+

CephObjectStoreZone name this CephObjectStore is part of

diff --git a/deploy/charts/rook-ceph/templates/resources.yaml b/deploy/charts/rook-ceph/templates/resources.yaml index 538968872..020caf280 100644 --- a/deploy/charts/rook-ceph/templates/resources.yaml +++ b/deploy/charts/rook-ceph/templates/resources.yaml @@ -12759,7 +12759,7 @@ spec: nullable: true properties: name: - description: RGW Zone the Object Store is in + description: CephObjectStoreZone name this CephObjectStore is part of type: string required: - name diff --git a/deploy/examples/crds.yaml b/deploy/examples/crds.yaml index 655076e4c..207e9178c 100644 --- a/deploy/examples/crds.yaml +++ b/deploy/examples/crds.yaml @@ -12750,7 +12750,7 @@ spec: nullable: true properties: name: - description: RGW Zone the Object Store is in + description: CephObjectStoreZone name this CephObjectStore is part of type: string required: - name diff --git a/pkg/apis/ceph.rook.io/v1/types.go b/pkg/apis/ceph.rook.io/v1/types.go index de3c4800c..936e25f2b 100755 --- a/pkg/apis/ceph.rook.io/v1/types.go +++ b/pkg/apis/ceph.rook.io/v1/types.go @@ -1901,7 +1901,7 @@ const ( // ZoneSpec represents a Ceph Object Store Gateway Zone specification type ZoneSpec struct { - // RGW Zone the Object Store is in + // CephObjectStoreZone name this CephObjectStore is part of Name string `json:"name"` }