diff --git a/manifests/composite/storage-cluster/ceph-conf.yaml b/manifests/composite/storage-cluster/ceph-conf.yaml index 05ffe5a48..ca668ca53 100644 --- a/manifests/composite/storage-cluster/ceph-conf.yaml +++ b/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] diff --git a/manifests/composite/storage-cluster/kustomization.yaml b/manifests/composite/storage-cluster/kustomization.yaml index 8d69b500c..0b08066d8 100644 --- a/manifests/composite/storage-cluster/kustomization.yaml +++ b/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 diff --git a/manifests/function/rook-cluster/pools/base/kustomization.yaml b/manifests/function/rook-cluster/pools/base/kustomization.yaml index b791ab6a4..8930136a9 100644 --- a/manifests/function/rook-cluster/pools/base/kustomization.yaml +++ b/manifests/function/rook-cluster/pools/base/kustomization.yaml @@ -1,6 +1,6 @@ resources: - upstream/pool.yaml -patches: +patchesJSON6902: - target: kind: CephBlockPool name: replicapool diff --git a/manifests/function/rook-cluster/pools/rbd/kustomization.yaml b/manifests/function/rook-cluster/pools/rbd/kustomization.yaml index 528b3231d..baed6397b 100644 --- a/manifests/function/rook-cluster/pools/rbd/kustomization.yaml +++ b/manifests/function/rook-cluster/pools/rbd/kustomization.yaml @@ -1,5 +1,5 @@ resources: - ../base namePrefix: rbd- -patchesStrategicMerge: +patches: - rbd-pool.yaml diff --git a/manifests/function/rook-operator/replacements/kustomization.yaml b/manifests/function/rook-operator/replacements/kustomization.yaml index ee1becf0d..048464317 100644 --- a/manifests/function/rook-operator/replacements/kustomization.yaml +++ b/manifests/function/rook-operator/replacements/kustomization.yaml @@ -1,2 +1,2 @@ resources: - - versions.yaml +- versions.yaml