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

Adopt new service catalog resource names #2048

Merged
merged 1 commit into from
Sep 14, 2017
Merged

Adopt new service catalog resource names #2048

merged 1 commit into from
Sep 14, 2017

Conversation

spadgett
Copy link
Member

@spadgett spadgett commented Sep 11, 2017 •
edited
Loading

https://trello.com/c/y1lbFrbp

Instance -> ServiceInstance
Binding -> ServiceInstanceCredential

Bump origin-web-common to 0.0.56
Bump origin-web-catalog to 0.0.45

Depends On:

openshift/origin#16150
openshift/origin-web-common#182
openshift/origin-web-catalog#426

@pmorie @jpeeler FYI

@spadgett
Copy link
Member Author

This doesn't yet remove alpha prefixes since that's not in service-catalog 0.0.17 and therefore should not be in openshift/origin#16150

@spadgett spadgett force-pushed the service-catalog-api-changes branch from f90bf07 to 25802eb Compare September 11, 2017 17:16
@spadgett spadgett mentioned this pull request Sep 11, 2017
Merged
@jpeeler jpeeler requested review from jwforres and jeff-phillips-18 and removed request for jeff-phillips-18 September 11, 2017 17:30
@spadgett
Copy link
Member Author

cc @jmontleon

@spadgett spadgett removed the request for review from jwforres September 11, 2017 17:36
@openshift-bot openshift-bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 11, 2017
@spadgett spadgett force-pushed the service-catalog-api-changes branch from 9dd2ac0 to fc7f978 Compare September 11, 2017 21:44
@spadgett
Copy link
Member Author

@jpeeler @jeff-phillips-18 FYI, I've been able to validate the name changes with openshift/origin#16150

@spadgett spadgett removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Sep 11, 2017
@spadgett spadgett mentioned this pull request Sep 13, 2017
Merged
@spadgett
Copy link
Member Author

Service catalog rebase has merged in origin.

@spadgett spadgett force-pushed the service-catalog-api-changes branch from fc7f978 to 4e244fd Compare September 13, 2017 23:12
@spadgett
Copy link
Member Author

To test with the latest service catalog.

  • Build latest oc from master
  • docker pull openshift/origin:latest
  • docker pull openshift/origin-service-catalog:latest
  • oc cluster up --version=latest --service-catalog

@dtaylor113
Copy link
Contributor

Cannot find any instances of:

'bindings'
"instances"
"Instance"

Searched in /app using both single and double quotes.

@spadgett
Adopt new service catalog resource names
b0b5fce 
Instance -> ServiceInstance
Binding -> ServiceInstanceCredential

Bump origin-web-common to 0.0.56
Bump origin-web-catalog to 0.0.45
@spadgett spadgett force-pushed the service-catalog-api-changes branch from 4e244fd to b0b5fce Compare September 14, 2017 14:23
@spadgett spadgett changed the title [WIP] Adopt new service catalog resource names Adopt new service catalog resource names Sep 14, 2017
@spadgett
Copy link
Member Author

Rebased and updated with dist. Includes catalog and common version bumps.

@spadgett
Copy link
Member Author

[test]

@openshift-bot
Copy link

Evaluated for origin web console test up to b0b5fce

@benjaminapetersen
Copy link
Contributor

First pass looks good. Working on running locally now. Deleted all my images & containers, but pulling origin:latest didn't seem to get the latest catalog images. My CatalogService.SERVICE_CATALOG_ENABLED is false due to the APIService.apiInfo() checks on all the catalog resources.

benjaminapetersen
benjaminapetersen approved these changes Sep 14, 2017
View reviewed changes
Copy link
Contributor

@benjaminapetersen benjaminapetersen left a comment

Choose a reason for hiding this comment

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

LGTM, aside from getting it up and running locally.

@openshift-bot
Copy link

Origin Web Console Test Results: SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin_web_console/184/) (Base Commit: 0e11a67) (PR Branch Commit: b0b5fce)

@spadgett
Copy link
Member Author

[merge][severity: blocker]

@spadgett
Copy link
Member Author

@benjaminapetersen You also need to run docker pull openshift/origin-service-catalog to get the latest service catalog image

@openshift-bot
Copy link

openshift-bot commented Sep 14, 2017 •
edited
Loading

Origin Web Console Merge Results: Waiting: You are in the build queue at position: 1

@openshift-bot
Copy link

Evaluated for origin web console merge up to b0b5fce

@openshift-bot openshift-bot merged commit 528a138 into openshift:master Sep 14, 2017
@spadgett spadgett deleted the service-catalog-api-changes branch September 14, 2017 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@benjaminapetersen benjaminapetersen benjaminapetersen approved these changes

@dtaylor113 dtaylor113 dtaylor113 approved these changes

@jeff-phillips-18 jeff-phillips-18 Awaiting requested review from jeff-phillips-18

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@spadgett @dtaylor113 @openshift-bot @benjaminapetersen