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 1808005: support multiple service binding request backingServiceSelectors #4381

Merged
merged 1 commit into from Feb 21, 2020

Conversation

christianvogt
Copy link
Contributor

Fixes:
Fixes https://issues.redhat.com/browse/ODC-3119

Analysis / Root cause:
ServiceBindingRequest is adding support for multiple backing service selectors.
See example:
https://github.com/redhat-developer/service-binding-operator/tree/master/examples/multiple_services

Old spec will be deprecated and removed in the future.

Solution Description:
Added support for the new spec.backingServiceSelectors selectors.
Kept backward compatibility with spec.backingServiceSelector.

Solution first checks for new spec will fallback to old.

Added unit tests.

Browser conformance:

  • Chrome
  • Firefox
  • Safari
  • Edge

cc @sbose78 @invincibleJai

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. approved Indicates a PR has been approved by an approver from all required OWNERS files. component/dev-console Related to dev-console labels Feb 19, 2020
@invincibleJai
Copy link
Member

looks good, how to verify scenario for backingServiceSelectors

@christianvogt
Copy link
Contributor Author

@invincibleJai I wrote the unit test for verification and ensured that the existing workflows continued to work.

@sbose78 suggestions on testing the new CRD?

I suppose we could just manually install the CRD and manually test without the operator even.

@invincibleJai
Copy link
Member

/lgtm

Verified locally existing workflows with SBR is working fine

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 21, 2020
@openshift-bot
Copy link
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: christianvogt, invincibleJai

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-merge-robot openshift-merge-robot merged commit 8f853b6 into openshift:master Feb 21, 2020
@spadgett spadgett added this to the v4.5 milestone Feb 22, 2020
@christianvogt christianvogt changed the title support multiple service binding request backingServiceSelectors Bug 1808005: support multiple service binding request backingServiceSelectors Feb 27, 2020
@openshift-ci-robot
Copy link
Contributor

@christianvogt: All pull requests linked via external trackers have merged. Bugzilla bug 1808005 has been moved to the MODIFIED state.

In response to this:

Bug 1808005: support multiple service binding request backingServiceSelectors

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.

@christianvogt
Copy link
Contributor Author

/kind bug

@openshift-ci-robot openshift-ci-robot added the kind/bug Categorizes issue or PR as related to a bug. label Feb 27, 2020
@christianvogt
Copy link
Contributor Author

/cherrypick release-4.4

@openshift-cherrypick-robot

@christianvogt: new pull request created: #4533

In response to this:

/cherrypick release-4.4

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.

@rohitkrai03
Copy link
Contributor

/cherrypick release-4.3

@openshift-cherrypick-robot

@rohitkrai03: #4381 failed to apply on top of branch "release-4.3":

Using index info to reconstruct a base tree...
A	frontend/packages/dev-console/src/components/topology/__tests__/service-binding-test-data.ts
M	frontend/packages/dev-console/src/components/topology/__tests__/topology-utils.spec.ts
M	frontend/packages/dev-console/src/components/topology/topology-utils.ts
Falling back to patching base and 3-way merge...
Auto-merging frontend/packages/dev-console/src/components/topology/topology-utils.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/topology/topology-utils.ts
Auto-merging frontend/packages/dev-console/src/components/topology/__tests__/topology-utils.spec.ts
CONFLICT (content): Merge conflict in frontend/packages/dev-console/src/components/topology/__tests__/topology-utils.spec.ts
CONFLICT (modify/delete): frontend/packages/dev-console/src/components/topology/__tests__/service-binding-test-data.ts deleted in HEAD and modified in support service binding request backingServiceSelectors. Version support service binding request backingServiceSelectors of frontend/packages/dev-console/src/components/topology/__tests__/service-binding-test-data.ts left in tree.
error: Failed to merge in the changes.
Patch failed at 0001 support service binding request backingServiceSelectors

In response to this:

/cherrypick release-4.3

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.

@christianvogt christianvogt deleted the sbr-bss branch August 20, 2020 16:30
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. component/dev-console Related to dev-console kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants