From 4a02c568e7947cd56a719d49db92266fc3cf9035 Mon Sep 17 00:00:00 2001 From: RAJAT SINGH Date: Tue, 13 Aug 2019 20:55:17 +0530 Subject: [PATCH] Added validation for cephBlockPool,cephfs and cephnfs.Added changes in ceph_manifest.go and resources.yaml according to common.yaml. Signed-off-by: RAJAT SINGH --- cluster/charts/rook-ceph/templates/resources.yaml | 6 ++++++ cluster/examples/kubernetes/ceph/common.yaml | 6 ++++++ tests/framework/installer/ceph_manifests.go | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml index 97fcf8247..5664a55f5 100644 --- a/cluster/charts/rook-ceph/templates/resources.yaml +++ b/cluster/charts/rook-ceph/templates/resources.yaml @@ -204,6 +204,8 @@ spec: metadataServer: properties: activeCount: + minimum: 1 + maximum: 10 type: integer activeStandby: type: boolean @@ -217,6 +219,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: @@ -233,6 +237,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml index 262c7640a..8fb04474b 100644 --- a/cluster/examples/kubernetes/ceph/common.yaml +++ b/cluster/examples/kubernetes/ceph/common.yaml @@ -225,6 +225,8 @@ spec: metadataServer: properties: activeCount: + minimum: 1 + maximum: 10 type: integer activeStandby: type: boolean @@ -238,6 +240,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: @@ -254,6 +258,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: diff --git a/tests/framework/installer/ceph_manifests.go b/tests/framework/installer/ceph_manifests.go index 0665a141f..663eae2e7 100644 --- a/tests/framework/installer/ceph_manifests.go +++ b/tests/framework/installer/ceph_manifests.go @@ -277,6 +277,8 @@ spec: metadataServer: properties: activeCount: + minimum: 1 + maximum: 10 type: integer activeStandby: type: boolean @@ -290,6 +292,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: @@ -306,6 +310,8 @@ spec: replicated: properties: size: + minimum: 1 + maximum: 10 type: integer erasureCoded: properties: