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.

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 new rook bundle creation script #584

Merged
merged 1 commit into from
Mar 20, 2024
Merged

Added new rook bundle creation script #584

merged 1 commit into from
Mar 20, 2024

Conversation

Nikhil-Ladha
Copy link
Member

@Nikhil-Ladha Nikhil-Ladha commented Mar 4, 2024

  • Added Dockerfile to create rook-ceph-operator-bundle under the rook repo.
  • Updated the Makefile to have the 'bundle' command, that reference the 'gen-bundle.sh' script under build/bundle.
  • Moved the rook csv under build/csv/ceph directory to keep all the manifests at one location for bundle creation

Checklist:

  • Commit Message Formatting: Commit titles and messages follow guidelines in the developer guide.
  • Reviewed the developer guide on Submitting a Pull Request
  • Pending release notes updated with breaking and/or notable changes for the next minor release.
  • Documentation has been updated, if necessary.
  • Unit tests have been added, if necessary.
  • Integration tests have been added, if necessary.

@Nikhil-Ladha
Copy link
Member Author

cc @subhamkrai @iamniting

@df-build-team df-build-team requested a review from a team March 5, 2024 08:01
@Nikhil-Ladha Nikhil-Ladha force-pushed the create-rook-bundle branch 2 times, most recently from 8f2a5b0 to 320df87 Compare March 5, 2024 11:00
@BlaineEXE
Copy link

IIRC, this master branch is just a resync of the master branch from github.com/rook/rook. I think these changes will be un-done the next time the branches are synced. Am I missing something? Or is there a way to make these changes to the Rook upstream as well?

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Mar 5, 2024
@travisn
Copy link

travisn commented Mar 5, 2024

IIRC, this master branch is just a resync of the master branch from github.com/rook/rook. I think these changes will be un-done the next time the branches are synced. Am I missing something? Or is there a way to make these changes to the Rook upstream as well?

The resync should just be bringing the commits from upstream to the downstream. It's not resetting the branch, so the only risk of making changes in the downstream master should be if there are merge conflicts. Also it's important to note that the downstream release branches will be created directly from the upstream branches, so any commits in the downstream master would not be included in the downstream release branches IIUC.

@Nikhil-Ladha
Copy link
Member Author

The resync should just be bringing the commits from upstream to the downstream. It's not resetting the branch, so the only risk of making changes in the downstream master should be if there are merge conflicts. Also it's important to note that the downstream release branches will be created directly from the upstream branches, so any commits in the downstream master would not be included in the downstream release branches IIUC.

The release branches created now are being synced from the downstream master only, though I guess once we have an upstream release that would be reset to an upstream release branch. So, once we get these changes into the master branch d/s, these changes would be synced to the release branch as well.

@Nikhil-Ladha
Copy link
Member Author

Tested the changes and everything is working fine

Copy link

openshift-ci bot commented Mar 19, 2024

@iamniting: changing LGTM is restricted to collaborators

In response to this:

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@Nikhil-Ladha Nikhil-Ladha force-pushed the create-rook-bundle branch 2 times, most recently from c71498a to 22046d7 Compare March 20, 2024 07:12
Added Dockerfile to create rook-ceph-operator-bundle under the rook repo.
Updated the Makefile to have the 'bundle' command, that reference the 'gen-bundle.sh'
script under `build/bundle`.
Moved the rook csv under build/csv/ceph directory to keep all the
manifests at one location for bundle creation

Signed-off-by: Nikhil-Ladha <nikhilladha1999@gmail.com>
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Mar 20, 2024
@subhamkrai subhamkrai requested a review from sp98 March 20, 2024 12:09
@sp98
Copy link

sp98 commented Mar 20, 2024

/approve

Copy link

openshift-ci bot commented Mar 20, 2024

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: iamniting, Nikhil-Ladha, sp98, subhamkrai

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@sp98 sp98 merged commit bdba0df into master Mar 20, 2024
48 of 49 checks passed
@subhamkrai subhamkrai deleted the create-rook-bundle branch March 20, 2024 13:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants