Merge "Add storage-cluster composite"

manifests/composite/storage-cluster/kustomization.yaml

@@ -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

manifests/type/airship-core/target/workload/kustomization.yaml

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

manifests/type/airship-core/target/workload/storage/rook/namespace.yaml

@@ -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

manifests/type/multi-tenant/target/workload/kustomization.yaml

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