Minor rook-ceph cleanup

This PS just includes minor changes for consistency and readability.

For consistency, patchesJSON6902 are always specified in
kustomization.yaml as patchesJSON6902 even if they could be specified as
patches. patchesStrategicMerge are always specified as patches.

Change-Id: I96b07838730207984be815e5f8fa8f79f59cebe1

manifests/composite/storage-cluster/ceph-conf.yaml

@@ -15,7 +15,7 @@ data:
     osd_pool_default_size = 3
     mon_warn_on_pool_no_redundancy = true
     # # You can add other default configuration sections
-    # # to create fully customized ceph.conf
+    # # to create a fully customized ceph.conf
     [mon]
     auth_allow_insecure_global_id_reclaim = false
     # [osd]

manifests/composite/storage-cluster/kustomization.yaml

@@ -1,17 +1,18 @@
 apiVersion: kustomize.config.k8s.io/v1beta1
 kind: Kustomization
 namespace: rook-ceph
+# Rook CephCluster Custom Resource along with recommended additions.
 resources:
   - ceph-conf.yaml
   - upstream/cluster.yaml
   - upstream/toolbox.yaml
-  # Below is the functions section. You are free to comment out or in oppsite to remove comments
-  # enabling or disabling any function in the list.
-  # All functions are independent, and can be deployed simultaneously at any moment.
+  # Functions for select Rook Ceph Resources. These resources are
+  # independent and can be commented out on an individual basis.
   - ../../function/rook-cluster/pools
   - ../../function/rook-cluster/cephfs
   - ../../function/rook-cluster/dashboard/http
   - ../../function/rook-cluster/storageclasses
+# Resource customizations
 patchesJSON6902:
 - target:
     kind: CephCluster

manifests/function/rook-cluster/pools/base/kustomization.yaml

@@ -1,6 +1,6 @@
 resources:
 - upstream/pool.yaml
-patches:
+patchesJSON6902:
 - target:
     kind: CephBlockPool
     name: replicapool

manifests/function/rook-cluster/pools/rbd/kustomization.yaml

@@ -1,5 +1,5 @@
 resources:
 - ../base
 namePrefix: rbd-
-patchesStrategicMerge:
+patches:
 - rbd-pool.yaml

manifests/function/rook-operator/replacements/kustomization.yaml

@@ -1,2 +1,2 @@
 resources:
-  - versions.yaml
+- versions.yaml