Merge "Minor rook-ceph cleanup"

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
+  # Functions for select Rook Ceph Resources. These resources are
-  # enabling or disabling any function in the list.
+  # independent and can be commented out on an individual basis.
-  # All functions are independent, and can be deployed simultaneously at any moment.
   - ../../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