ceph: fix external cluster upgrade

Both MonSpec.Count and CephVersionSpec.Image should be optional for the
external cluster. So marking them as so.

Signed-off-by: Sébastien Han <seb@redhat.com>

cluster/charts/rook-ceph/templates/resources.yaml

@@ -479,8 +479,6 @@ spec:
                     image:
                       description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v16.2.4
                       type: string
-                  required:
-                    - image
                   type: object
                 cleanupPolicy:
                   description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster deletion is not imminent.
@@ -1142,8 +1140,6 @@ spec:
                           type: object
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
-                  required:
-                    - count
                   type: object
                 monitoring:
                   description: Prometheus based Monitoring settings

cluster/examples/kubernetes/ceph/crds.yaml

@@ -479,8 +479,6 @@ spec:
                     image:
                       description: Image is the container image used to launch the ceph daemons, such as ceph/ceph:v16.2.4
                       type: string
-                  required:
-                    - image
                   type: object
                 cleanupPolicy:
                   description: Indicates user intent when deleting a cluster; blocks orchestration and should not be set if cluster deletion is not imminent.
@@ -1142,8 +1140,6 @@ spec:
                           type: object
                       type: object
                       x-kubernetes-preserve-unknown-fields: true
-                  required:
-                    - count
                   type: object
                 monitoring:
                   description: Prometheus based Monitoring settings

pkg/apis/ceph.rook.io/v1/types.go

@@ -252,7 +252,8 @@ type KeyManagementServiceSpec struct {
 // CephVersionSpec represents the settings for the Ceph version that Rook is orchestrating.
 type CephVersionSpec struct {
 	// Image is the container image used to launch the ceph daemons, such as ceph/ceph:v16.2.4
-	Image string `json:"image"`
+	// +optional
+	Image string `json:"image,omitempty"`
 
 	// Whether to allow unsupported versions (do not set to true in production)
 	// +optional
@@ -448,7 +449,8 @@ const (
 type MonSpec struct {
 	// Count is the number of Ceph monitors
 	// +kubebuilder:validation:Minimum=0
-	Count int `json:"count"`
+	// +optional
+	Count int `json:"count,omitempty"`
 	// AllowMultiplePerNode determines if we can run multiple monitors on the same node (not recommended)
 	// +optional
 	AllowMultiplePerNode bool `json:"allowMultiplePerNode,omitempty"`