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

ocs-to-ocs: fix: rbac and GVK #1674

Merged
merged 2 commits into from May 12, 2022

Conversation

subhamkrai
Copy link
Contributor

ocs-to-ocs: fix rbac and GVK

Signed-off-by: subhamkrai srai@redhat.com

Signed-off-by: subhamkrai <srai@redhat.com>
Signed-off-by: subhamkrai <srai@redhat.com>
@subhamkrai subhamkrai changed the title Test ocs-to-ocs: fix: rbac and GVK May 11, 2022
Copy link
Member

@Madhu-1 Madhu-1 left a comment

Choose a reason for hiding this comment

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

LGTM

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label May 11, 2022
@Madhu-1
Copy link
Member

Madhu-1 commented May 11, 2022

/cherry-pick release-v4.11

@openshift-cherrypick-robot

@Madhu-1: once the present PR merges, I will cherry-pick it on top of release-v4.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-v4.11

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.

@subhamkrai
Copy link
Contributor Author

@nb-ohad @umangachapagain

@agarwal-mudit
Copy link
Member

/cherry-pick release-4.11

@openshift-cherrypick-robot

@agarwal-mudit: once the present PR merges, I will cherry-pick it on top of release-4.11 in a new PR and assign it to you.

In response to this:

/cherry-pick release-4.11

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.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 11, 2022

@subhamkrai: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/red-hat-storage-ocs-ci-e2e-aws a8dc7f8 link false /test red-hat-storage-ocs-ci-e2e-aws

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

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.

Please add some description about what each commit fixes and how.

Not blocking the PR on this.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 12, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: Madhu-1, subhamkrai, 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 May 12, 2022
@openshift-merge-robot openshift-merge-robot merged commit 5c1f778 into red-hat-storage:main May 12, 2022
@openshift-cherrypick-robot

@Madhu-1: cannot checkout release-v4.11: error checking out release-v4.11: exit status 1. output: error: pathspec 'release-v4.11' did not match any file(s) known to git

In response to this:

/cherry-pick release-v4.11

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.

@openshift-cherrypick-robot

@agarwal-mudit: #1674 failed to apply on top of branch "release-4.11":

Applying: ocs-to-ocs: fix GVK
Using index info to reconstruct a base tree...
M	controllers/storageclassclaim/storageclassclaim_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/storageclassclaim/storageclassclaim_controller.go
CONFLICT (content): Merge conflict in controllers/storageclassclaim/storageclassclaim_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ocs-to-ocs: fix GVK
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.11

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.

@Madhu-1
Copy link
Member

Madhu-1 commented May 12, 2022

@subhamkrai we need manual backporting, not sure why cherry-pick failed.

@agarwal-mudit
Copy link
Member

even #1664 failed for a automatic backport

@agarwal-mudit
Copy link
Member

/cherry-pick release-4.11

@openshift-cherrypick-robot

@agarwal-mudit: #1674 failed to apply on top of branch "release-4.11":

Applying: ocs-to-ocs: fix GVK
Using index info to reconstruct a base tree...
M	controllers/storageclassclaim/storageclassclaim_controller.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/storageclassclaim/storageclassclaim_controller.go
CONFLICT (content): Merge conflict in controllers/storageclassclaim/storageclassclaim_controller.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ocs-to-ocs: fix GVK
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.11

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.

@Madhu-1
Copy link
Member

Madhu-1 commented May 24, 2022

/cherry-pick release-4.11

@openshift-cherrypick-robot

@Madhu-1: new pull request created: #1694

In response to this:

/cherry-pick release-4.11

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.

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.

None yet

6 participants