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.

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

Replace OperatorSource with CatalogSource for backing service in Service Binding #25383

Merged
merged 1 commit into from
Dec 17, 2020
Merged

Replace OperatorSource with CatalogSource for backing service in Service Binding #25383

merged 1 commit into from
Dec 17, 2020

Conversation

pmacik
Copy link
Contributor

@pmacik pmacik commented Sep 10, 2020

This PR is meant for ocp v4.5+

The docs shows installation of a backing service operator that is done via OperatorSource. That is obsolete in v4.5 and removed in v4.6, so this PR updates the docs by replacing the OperatorSource with CatalogSource.

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Sep 10, 2020
@pmacik pmacik force-pushed the db-for-service-binding-catalog-source branch from 3948425 to 4772410 Compare September 10, 2020 14:43
@openshift-ci-robot openshift-ci-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/S Denotes a PR that changes 10-29 lines, ignoring generated files. labels Sep 10, 2020
@pmacik
Copy link
Contributor Author

pmacik commented Oct 27, 2020

Hi @vikram-redhat Could you please take a look at this? Thx

@vikram-redhat
Copy link
Contributor

@Preeticp PTAL

Preeticp
Preeticp reviewed Oct 27, 2020
View reviewed changes
Copy link
Contributor

@Preeticp Preeticp left a comment

Choose a reason for hiding this comment

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

@pmacik thank you for this PR.
I have made a minor style suggestion as per docs conventions. Other than that, it's an LGTM from me.

@Preeticp
Copy link
Contributor

@pmacik just wanted to confirm, AFAIU, this PR needs to be merged to the 4.5, 4.6 and later versions, right?

@pmacik
Copy link
Contributor Author

pmacik commented Dec 2, 2020

@pmacik just wanted to confirm, AFAIU, this PR needs to be merged to the 4.5, 4.6 and later versions, right?

Yes.

Preeticp
Preeticp requested changes Dec 4, 2020
View reviewed changes
Copy link
Contributor

@Preeticp Preeticp left a comment

Choose a reason for hiding this comment

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

@pmacik if you could please fix these comments I will ping the OCP docs team and ask them for a review and merge. Thank you.

modules/odc-connecting-components.adoc Outdated Show resolved Hide resolved
modules/odc-connecting-components.adoc Outdated Show resolved Hide resolved
modules/odc-connecting-components.adoc Outdated Show resolved Hide resolved
@Preeticp
Copy link
Contributor

Preeticp commented Dec 4, 2020

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2020
@pneedle-rh pneedle-rh self-requested a review December 4, 2020 12:26
@pneedle-rh pneedle-rh added this to the Next Release milestone Dec 4, 2020
pneedle-rh
pneedle-rh reviewed Dec 4, 2020
View reviewed changes
Copy link
Contributor

@pneedle-rh pneedle-rh left a comment

Choose a reason for hiding this comment

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

@pmacik and @Preeticp I have outlined a couple of suggestions below. Other than that, this PR looks good to me!

  • Please squash your commits into one.

  • Line 64 in the updated module file (modules/odc-connecting-components.adoc) still refers to the backing OperatorSource. Please update this introduction to the procedure so that it references the CatalogSource resource instead.

@pneedle-rh pneedle-rh added peer-review-done Signifies that the peer review team has reviewed this PR and removed peer-review-needed Signifies that the peer review team needs to review this PR labels Dec 4, 2020
@pmacik pmacik force-pushed the db-for-service-binding-catalog-source branch from 2c3c136 to 082b457 Compare December 4, 2020 12:56
@openshift-ci-robot
Copy link

New changes are detected. LGTM label has been removed.

@openshift-ci-robot openshift-ci-robot removed the lgtm Indicates that a PR is ready to be merged. label Dec 4, 2020
@pmacik
Copy link
Contributor Author

pmacik commented Dec 4, 2020

@pneedle-rh Good catch, thx. I've fixed, rebased and squashed the commits.

@pmacik pmacik force-pushed the db-for-service-binding-catalog-source branch from 082b457 to 4634ee6 Compare December 16, 2020 13:30
@pneedle-rh
Copy link
Contributor

@pmacik and @Preeticp thank you for your update. This now looks great!

@pmacik @Preeticp
Replace OperatorSource with CatalogSource for backing service in Serv…
778709d 
…ice Binding

Co-authored-by: Preeti Chandrashekar <preetipagad@gmail.com>
@pmacik pmacik force-pushed the db-for-service-binding-catalog-source branch from 4634ee6 to 778709d Compare December 17, 2020 06:25
@pmacik
Copy link
Contributor Author

pmacik commented Dec 17, 2020

@pneedle-rh There were conflicts with the base branch, so I rebased and fixed those conflicts.

@pneedle-rh pneedle-rh merged commit 388ee2a into openshift:master Dec 17, 2020
@pneedle-rh
Copy link
Contributor

pneedle-rh commented Dec 17, 2020 •
edited by openshift-ci-robot

/cherrypick enterprise-4.5

@openshift-cherrypick-robot openshift-cherrypick-robot mentioned this pull request Dec 17, 2020
Merged
@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 17, 2020 •
edited by openshift-ci-robot

@pneedle-rh: new pull request created: #28192

In response to this:

/cherrypick enterprise-4.5

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.

@pneedle-rh
Copy link
Contributor

pneedle-rh commented Dec 17, 2020 •
edited by openshift-ci-robot

/cherrypick enterprise-4.6

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 17, 2020 •
edited by openshift-ci-robot

@pneedle-rh: #25383 failed to apply on top of branch "enterprise-4.6":

Applying: Replace OperatorSource with CatalogSource for backing service in Service Binding
Using index info to reconstruct a base tree...
M	modules/odc-connecting-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-connecting-components.adoc
CONFLICT (content): Merge conflict in modules/odc-connecting-components.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 Replace OperatorSource with CatalogSource for backing service in Service Binding
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:

/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.

@pneedle-rh
Copy link
Contributor

pneedle-rh commented Dec 17, 2020 •
edited by openshift-ci-robot

/cherrypick enterprise-4.7

@openshift-cherrypick-robot
Copy link

openshift-cherrypick-robot commented Dec 17, 2020 •
edited by openshift-ci-robot

@pneedle-rh: #25383 failed to apply on top of branch "enterprise-4.7":

Applying: Replace OperatorSource with CatalogSource for backing service in Service Binding
Using index info to reconstruct a base tree...
M	modules/odc-connecting-components.adoc
Falling back to patching base and 3-way merge...
Auto-merging modules/odc-connecting-components.adoc
CONFLICT (content): Merge conflict in modules/odc-connecting-components.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 Replace OperatorSource with CatalogSource for backing service in Service Binding
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:

/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.

This was referenced Dec 17, 2020
Merged
Merged
@pneedle-rh
Copy link
Contributor

pneedle-rh commented Dec 17, 2020 •
edited by openshift-ci-robot

@pmacik and @Preeticp there were merge conflicts when cherry picking this PR to enterprise-4.6 and enterprise-4.7. The conflicts were due to the object API references having already been updated to reflect the new guidelines.

I have now manually cherry picked this PR for those releases. The enterprise-4.5 cherry pick is also now complete.

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

@pneedle-rh pneedle-rh pneedle-rh left review comments

@Preeticp Preeticp Preeticp requested changes

@vikram-redhat vikram-redhat Awaiting requested review from vikram-redhat

Assignees

@Preeticp Preeticp

Labels
branch/enterprise-4.5 branch/enterprise-4.6 branch/enterprise-4.7 peer-review-done Signifies that the peer review team has reviewed this PR 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.

None yet
6 participants
@pmacik @vikram-redhat @Preeticp @openshift-ci-robot @pneedle-rh @openshift-cherrypick-robot