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

Bug 2302257: console: use github.com/openshift/api/console/v1 #229

Conversation

GowthamShanmugam
Copy link
Contributor

@GowthamShanmugam GowthamShanmugam commented Aug 1, 2024

@vbnrh
Copy link
Member

vbnrh commented Aug 2, 2024

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm label Aug 2, 2024
Copy link
Contributor

openshift-ci bot commented Aug 2, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: GowthamShanmugam, vbnrh

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 label Aug 2, 2024
@openshift-merge-bot openshift-merge-bot bot merged commit 95066c0 into red-hat-storage:main Aug 2, 2024
11 checks passed
@GowthamShanmugam
Copy link
Contributor Author

/retitle Bug 2302257: console: use github.com/openshift/api/console/v1

@openshift-ci openshift-ci bot changed the title console: use github.com/openshift/api/console/v1 Bug 2302257: console: use github.com/openshift/api/console/v1 Aug 2, 2024
@GowthamShanmugam
Copy link
Contributor Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@GowthamShanmugam: #229 failed to apply on top of branch "release-4.16":

Applying: console: use github.com/openshift/api/console/v1
Using index info to reconstruct a base tree...
M	controllers/manager.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/manager.go
CONFLICT (content): Merge conflict in controllers/manager.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 console: use github.com/openshift/api/console/v1
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.16

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-sigs/prow repository.

@GowthamShanmugam
Copy link
Contributor Author

/cherry-pick release-4.16

@openshift-cherrypick-robot

@GowthamShanmugam: #229 failed to apply on top of branch "release-4.16":

Applying: console: use github.com/openshift/api/console/v1
Using index info to reconstruct a base tree...
M	controllers/manager.go
Falling back to patching base and 3-way merge...
Auto-merging controllers/manager.go
CONFLICT (content): Merge conflict in controllers/manager.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 console: use github.com/openshift/api/console/v1
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.16

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-sigs/prow repository.

@agarwal-mudit
Copy link
Member

@GowthamShanmugam is this merged in 4.17?

@GowthamShanmugam
Copy link
Contributor Author

@GowthamShanmugam is this merged in 4.17?

Yes, it looks like it is auto backported from master to release-4.17: https://github.com/red-hat-storage/odf-multicluster-orchestrator/commits/release-4.17/

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants