Merge pull request #2492 from Nikhil-Ladha/remove-rook-csv

Added the new rook bundle and removed rook csv from ocs-operator
red-hat-storage · Mar 20, 2024 · d8c4789 · d8c4789
2 parents 16f3414 + 41bc21e
commit d8c4789
Show file tree

Hide file tree

Showing 52 changed files with 86 additions and 27,429 deletions.
diff --git a/.gitignore b/.gitignore
@@ -56,6 +56,7 @@ bin
 
 catalog/ocs-bundle.yaml
 catalog/noobaa-bundle.yaml
+catalog/rook-ceph-bundle.yaml
 
 tools/csv-merger/csv-merger
 tools/csv-checksum/csv-checksum

diff --git a/Makefile b/Makefile
@@ -187,3 +187,7 @@ install-noobaa: operator-sdk
 install-ocs: operator-sdk
 	@echo "Installing ocs operator"
 	hack/install-ocs.sh
+
+install-rook: operator-sdk
+	@echo "Installing rook-ceph operator"
+	hack/install-rook.sh
diff --git a/catalog/index.yaml b/catalog/index.yaml
@@ -9,6 +9,17 @@ name: alpha
 entries:
   - name: ocs-operator.v4.15.0
 
+---
+defaultChannel: alpha
+name: rook-ceph-operator
+schema: olm.package
+---
+schema: olm.channel
+package: rook-ceph-operator
+name: alpha
+entries:
+  - name: rook-ceph-operator.v4.15.0
+
 ---
 defaultChannel: alpha
 name: noobaa-operator

diff --git a/deploy/csv-templates/crds/rook/ceph.rook.io_cephblockpoolradosnamespaces.yaml b/deploy/csv-templates/crds/rook/ceph.rook.io_cephblockpoolradosnamespaces.yaml