From f00092de73c9836899186799fe67d6a6aae2e297 Mon Sep 17 00:00:00 2001 From: zoetrope Date: Wed, 15 Apr 2020 14:45:59 +0900 Subject: [PATCH 1/2] ceph: Add requireSafeReplicaSize in CephObjectStore CRD Add requireSafeReplicaSize field in CephObjectStore CRD. Closes: https://github.com/rook/rook/issues/5260 Signed-off-by: zoetrope --- cluster/charts/rook-ceph/templates/resources.yaml | 8 ++++++++ cluster/examples/kubernetes/ceph/common.yaml | 4 ++++ 2 files changed, 12 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 4be8c928a..3ccfea22a 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -215,6 +215,8 @@ spec: minimum: 0 maximum: 10 type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -245,6 +247,8 @@ spec: minimum: 0 maximum: 10 type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -353,6 +357,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -375,6 +381,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 8d49d6cff..2188a0f8c 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -420,6 +420,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -442,6 +444,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: From babb55cc15ca108fd9bc5453746a62e1f1aa5c1c Mon Sep 17 00:00:00 2001 From: zoetrope Date: Thu, 16 Apr 2020 15:18:00 +0900 Subject: [PATCH 2/2] ceph: add requireSafeReplicaSize to CRD add requireSafeReplicaSize field to CRD in upgrade-from-v1.2-crds.yaml and ceph_manifets.go Signed-off-by: zoetrope --- cluster/examples/kubernetes/ceph/upgrade-from-v1.2-crds.yaml | 4 ++++ tests/framework/installer/ceph_manifests.go | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/cluster/examples/kubernetes/ceph/upgrade-from-v1.2-crds.yaml b/cluster/examples/kubernetes/ceph/upgrade-from-v1.2-crds.yaml index 86e3bb271..df5b00979 100644 --- a/cluster/examples/kubernetes/ceph/upgrade-from-v1.2-crds.yaml +++ b/cluster/examples/kubernetes/ceph/upgrade-from-v1.2-crds.yaml @@ -395,6 +395,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -417,6 +419,8 @@ spec: properties: size: type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 38e7e3d56..8c48bf2bc 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -299,6 +299,8 @@ spec: minimum: 0 maximum: 10 type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: @@ -329,6 +331,8 @@ spec: minimum: 0 maximum: 10 type: integer + requireSafeReplicaSize: + type: boolean erasureCoded: properties: dataChunks: