Add storage-cluster composite

Storage configuration for Rook is currently located within the
airship-core type; however, the multi-tenant type no longer inherits
this configuration from the airship-core type. This change introduces a
new composite, storage-cluster, to share the configuration between both
types.

Signed-off-by: Drew Walters <andrew.walters@att.com>
Change-Id: Ib10098b38466725f00d9ec9d48058cd269544a3a
This commit is contained in:
Drew Walters 2021-05-20 09:57:15 +00:00
parent bb8962f3fc
commit 1c8a5891b1
9 changed files with 6 additions and 16 deletions

View File

@ -2,18 +2,16 @@ apiVersion: kustomize.config.k8s.io/v1beta1
kind: Kustomization
namespace: rook-ceph
resources:
- namespace.yaml # Name space (rook-ceph) should be installed together with the rook-operator
# however we add this file here, to make sure we do have this ns deployed.
- ceph-conf.yaml
- cephcluster.yaml
- rook-ceph-tools.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.
- ../../../../../../function/rook-cluster/pools
- ../../../../../../function/rook-cluster/cephfs
- ../../../../../../function/rook-cluster/dashboard/http
- ../../../../../../function/rook-cluster/storageclasses
- ../../function/rook-cluster/pools
- ../../function/rook-cluster/cephfs
- ../../function/rook-cluster/dashboard/http
- ../../function/rook-cluster/storageclasses
patchesJSON6902:
- target:
kind: CephCluster

View File

@ -1,3 +1,3 @@
resources:
- ../../../../composite/storage-cluster
- ../../../../function/ingress
- storage/rook

View File

@ -1,9 +0,0 @@
# TO BE DELETED
# The namespace rook-ceph should be installed together
# with rook-ceph-operator. However, we will keep this file
# in current PS for the debug purposes.
# apiVersion: v1
# kind: Namespace
# metadata:
# name: rook-ceph

View File

@ -1,4 +1,5 @@
resources:
- ../../../../composite/storage-cluster
- ../../../../function/ingress
- ../../../../function/sip
- ../../../../function/synclabeller