Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added the new rook bundle and removed rook csv from ocs-operator #2492

Merged
merged 3 commits into from
Mar 20, 2024
Merged

Added the new rook bundle and removed rook csv from ocs-operator #2492

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6b50f2
Add rook bundle to ocs-operator catalog
Nikhil-Ladha Mar 4, 2024
207d768
Remove rook csv,crds generation from ocs-operator
Nikhil-Ladha Mar 19, 2024
41bc21e
Add generated changes for rook csv removal
Nikhil-Ladha Mar 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
11 changes: 11 additions & 0 deletions catalog/index.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
66 changes: 0 additions & 66 deletions deploy/csv-templates/crds/rook/ceph.rook.io_cephblockpoolradosnamespaces.yaml
View file
Open in desktop

This file was deleted.

Loading
Loading