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

Rook api & image update to latest master #2224

Merged
merged 2 commits into from
Nov 16, 2023

Conversation

malayparida2000
Copy link
Contributor

@malayparida2000 malayparida2000 commented Oct 19, 2023

Update rook api & image to latest on master.
Also add make deps-update changes
Fix breaking changes in manager due to new controller-runtime version
Unit test fixes after controller-runtime update to v0.16.0
Create mock storageClusters with finalizers inside them as the fake
client has issues when both status & objectmeta are updated in the same
reconcile loop.
Also fixed TestCreateSCCs & TestOcsProviderServerEnsureCreated tests.
No longer skip the TestOCSProviderServerStorageClassRequest test.

@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Oct 19, 2023
@red-hat-storage red-hat-storage deleted a comment from openshift-ci bot Oct 19, 2023
@openshift-merge-robot openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 3, 2023
@openshift-merge-robot openshift-merge-robot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Nov 10, 2023
@malayparida2000 malayparida2000 force-pushed the rook branch 2 times, most recently from 4101a1a to 228cb9a Compare November 14, 2023 19:21
@malayparida2000
Copy link
Contributor Author

/retest

@malayparida2000 malayparida2000 force-pushed the rook branch 6 times, most recently from fa1a0e6 to 20c97b4 Compare November 15, 2023 04:41
@malayparida2000 malayparida2000 changed the title Rook api & image update Rook api & image update to latest master Nov 16, 2023
Copy link
Contributor

@umangachapagain umangachapagain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Keep the CSV generation commit and squash the other 3.
Since first commit breaks the build and unit test, it's good to have fixes for those in the same commit.

Copy link
Contributor

@umangachapagain umangachapagain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a description to the PR and commit about breaking changes. It's easier to track a change via commit later.

go get github.com/rook/rook@master
go get github.com/rook/rook/pkg/apis@master
Also add make deps-update changes
Fix breaking changes in manager due to new controller-runtime version
Unit test fixes after controller-runtime update to v0.16.0
Create mock storageClusters with finalizers inside them as the fake
client has issues when both status & objectmeta are updated in the same
reconcile loop.
Also fixed TestCreateSCCs & TestOcsProviderServerEnsureCreated tests.
No longer skip the TestOCSProviderServerStorageClassRequest test.

Signed-off-by: Malay Kumar Parida <[email protected]>
Also add make gen-latest-csv changes

Signed-off-by: Malay Kumar Parida <[email protected]>
@malayparida2000
Copy link
Contributor Author

Keep the CSV generation commit and squash the other 3. Since first commit breaks the build and unit test, it's good to have fixes for those in the same commit.

Done

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Nov 16, 2023
Copy link
Contributor

openshift-ci bot commented Nov 16, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: malayparida2000, umangachapagain

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

The pull request process is described 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

@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Nov 16, 2023
@openshift-merge-bot openshift-merge-bot bot merged commit e6631e6 into red-hat-storage:main Nov 16, 2023
7 checks passed
@malayparida2000 malayparida2000 deleted the rook branch June 11, 2024 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants