From e0e769c30e68452f8fcef981c19b8722167cdf36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Tue, 27 Aug 2019 22:49:14 +0200
Subject: [PATCH] ceph: do not require mon in common.yaml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

For the external cluster setup, we don't have monitors to deploy because
we connect to external ones. So in the common.yaml we must not require a
mon section to be defined in the cluster CR.

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 cluster/charts/rook-ceph/templates/resources.yaml | 12 ++++--------
 cluster/examples/kubernetes/ceph/common.yaml      |  2 --
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/cluster/charts/rook-ceph/templates/resources.yaml b/cluster/charts/rook-ceph/templates/resources.yaml
index a8c0fa7c7..cc30e4fed 100644
--- a/cluster/charts/rook-ceph/templates/resources.yaml
+++ b/cluster/charts/rook-ceph/templates/resources.yaml
@@ -45,10 +45,8 @@ spec:
                   type: boolean
                 count:
                   maximum: 9
-                  minimum: 1
+                  minimum: 0
                   type: integer
-              required:
-              - count
             network:
               properties:
                 hostNetwork:
@@ -80,7 +78,7 @@ spec:
                           encryptedDevice:
                             type: string
                             pattern: ^(true|false)$
-                      useAllDevices: 
+                      useAllDevices:
                         type: boolean
                       deviceFilter: {}
                       directories:
@@ -99,7 +97,7 @@ spec:
                       location: {}
                       resources: {}
                   type: array
-                useAllDevices: 
+                useAllDevices:
                   type: boolean
                 deviceFilter: {}
                 location: {}
@@ -110,7 +108,7 @@ spec:
                       path:
                         type: string
                 config: {}
-                topologyAware: 
+                topologyAware:
                   type: boolean
             monitoring:
               properties:
@@ -124,8 +122,6 @@ spec:
                   type: integer
             placement: {}
             resources: {}
-          required:
-          - mon
   additionalPrinterColumns:
     - name: DataDirHostPath
       type: string
diff --git a/cluster/examples/kubernetes/ceph/common.yaml b/cluster/examples/kubernetes/ceph/common.yaml
index 5d766030f..6ec0586d0 100644
--- a/cluster/examples/kubernetes/ceph/common.yaml
+++ b/cluster/examples/kubernetes/ceph/common.yaml
@@ -141,8 +141,6 @@ spec:
                   type: integer
             placement: {}
             resources: {}
-          required:
-          - mon
   additionalPrinterColumns:
     - name: DataDirHostPath
       type: string