Skip to content

Add procedure for removing custom Operator catalogs #30884

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

Jump to bottom
Merged
adellape merged 1 commit into from
Mar 25, 2021
Merged

Add procedure for removing custom Operator catalogs #30884

adellape merged 1 commit into from
Mar 25, 2021

Conversation

@adellape
Copy link
Contributor

@adellape adellape commented Mar 24, 2021 •
edited
Loading

Fixes #28108.

Preview build:

@adellape adellape added this to the Next Release milestone Mar 24, 2021
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Mar 24, 2021
@netlify
Copy link

netlify bot commented Mar 24, 2021 •
edited
Loading

Deploy preview for osdocs ready!

Built with commit ea43709

https://deploy-preview-30884--osdocs.netlify.app

@adellape adellape added the issue-burndown Indicates an issue worked on during an "GitHub Issue Burndown" session label Mar 24, 2021
@adellape adellape force-pushed the rm_catalog branch 2 times, most recently from 426242b to 97d5cfa Compare March 25, 2021 15:30
jeana-redhat
jeana-redhat approved these changes Mar 25, 2021
View reviewed changes
Copy link
Contributor

@jeana-redhat jeana-redhat left a comment

Choose a reason for hiding this comment

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

Super minor style stuff (my favorite 😛 ) LGTM

@adellape adellape merged commit 80d964e into openshift:master Mar 25, 2021
@adellape adellape deleted the rm_catalog branch March 25, 2021 19:39
@adellape
Copy link
Contributor Author

adellape commented Mar 25, 2021

/cherrypick enterprise-4.6

@adellape
Copy link
Contributor Author

adellape commented Mar 25, 2021

/cherrypick enterprise-4.7

@adellape
Copy link
Contributor Author

adellape commented Mar 25, 2021

/cherrypick enterprise-4.8

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 25, 2021

@adellape: #30884 failed to apply on top of branch "enterprise-4.6":

Applying: Add procedure for removing custom Operator catalogs
Using index info to reconstruct a base tree...
M	operators/admin/olm-managing-custom-catalogs.adoc
Falling back to patching base and 3-way merge...
Auto-merging operators/admin/olm-managing-custom-catalogs.adoc
CONFLICT (content): Merge conflict in operators/admin/olm-managing-custom-catalogs.adoc
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add procedure for removing custom Operator catalogs
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".
Details

In response to this:

/cherrypick enterprise-4.6

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 openshift-cherrypick-robot mentioned this pull request Mar 25, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 25, 2021

@adellape: new pull request created: #30952

Details

In response to this:

/cherrypick enterprise-4.7

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 openshift-cherrypick-robot mentioned this pull request Mar 25, 2021
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Mar 25, 2021

@adellape: new pull request created: #30953

Details

In response to this:

/cherrypick enterprise-4.8

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.

@adellape adellape mentioned this pull request Mar 25, 2021
Merged
bandrade
bandrade reviewed Mar 25, 2021
View reviewed changes
Copy link

@bandrade bandrade left a comment

Choose a reason for hiding this comment

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

/lgtm

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

Reviewers

@jeana-redhat jeana-redhat jeana-redhat approved these changes

+1 more reviewer

@bandrade bandrade bandrade left review comments

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

branch/enterprise-4.6 branch/enterprise-4.7 branch/enterprise-4.8 issue-burndown Indicates an issue worked on during an "GitHub Issue Burndown" session size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

Next Release

Development

Successfully merging this pull request may close these issues.

[enterprise-4.6] Issue in file operators/admin/olm-managing-custom-catalogs.adoc

5 participants

@adellape @openshift-cherrypick-robot @bandrade @jeana-redhat @openshift-ci-robot