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

Look for provider display name annotation on image streams #487

Merged
merged 1 commit into from
Oct 20, 2017
Merged

Look for provider display name annotation on image streams #487

merged 1 commit into from
Oct 20, 2017

Conversation

spadgett
Copy link
Member

Waiting for consensus on the name in openshift/origin#16755

@sspeiche

@openshift-ci-robot openshift-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 10, 2017
@spadgett spadgett mentioned this pull request Oct 10, 2017
Merged
@rhamilto rhamilto mentioned this pull request Oct 10, 2017
Merged
@spadgett spadgett force-pushed the is-provider-display-name branch from 022d6ce to d0eab10 Compare October 18, 2017 19:05
@openshift-ci-robot openshift-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Oct 18, 2017
@spadgett
Copy link
Member Author

Annotation is openshift.io/provider-display-name for both templates and image streams.

openshift/origin#16755 (comment)

Removing WIP from the PR

@spadgett spadgett requested a review from jwforres October 18, 2017 19:07
@spadgett spadgett changed the title [WIP] Look for provider display name annotation on image streams Look for provider display name annotation on image streams Oct 18, 2017
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 18, 2017
@spadgett spadgett force-pushed the is-provider-display-name branch from d0eab10 to fd01934 Compare October 18, 2017 19:13
@spadgett
Copy link
Member Author

See also

openshift/origin#16925
openshift/origin#16899

@spadgett spadgett mentioned this pull request Oct 18, 2017
Merged
@rhamilto
Copy link
Member

@spadgett, don't forget to update the create-from-builder template and controller. #485 ended up not including the necessary updates.

@jwforres
Copy link
Member

Will wait to review till @rhamilto 's comment is addressed

@spadgett spadgett force-pushed the is-provider-display-name branch from fd01934 to 3ded6a3 Compare October 18, 2017 20:24
@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 Oct 18, 2017
@spadgett spadgett force-pushed the is-provider-display-name branch from 3ded6a3 to 998d908 Compare October 18, 2017 20:26
@spadgett
Copy link
Member Author

Thanks @rhamilto I updated the dialog, too.

@spadgett spadgett requested a review from rhamilto October 18, 2017 20:27
@jwforres
Copy link
Member

LGTM but waiting on the origin PR to get merged, also travis is failing

@spadgett spadgett force-pushed the is-provider-display-name branch from 998d908 to 36ac405 Compare October 18, 2017 22:31
@spadgett
Copy link
Member Author

also travis is failing

The new vendor I added to the mock image stream was causing the tests to fail. Just pushed an update.

@spadgett spadgett force-pushed the is-provider-display-name branch from 36ac405 to 602c755 Compare October 19, 2017 12:43
@spadgett spadgett mentioned this pull request Oct 19, 2017
Merged
@spadgett spadgett changed the title Look for provider display name annotation on image streams [WIP] Look for provider display name annotation on image streams Oct 19, 2017
@openshift-ci-robot openshift-ci-robot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 19, 2017
@spadgett spadgett changed the title [WIP] Look for provider display name annotation on image streams Look for provider display name annotation on image streams Oct 20, 2017
@openshift-ci-robot openshift-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 20, 2017
@spadgett
Look for openshift.io/provider-display-name
e2e4281 
Look for the `openshift.io/provider-display-name` annotation on
templates and image streams. Show the value in the create from builder
dialog.
@spadgett spadgett force-pushed the is-provider-display-name branch from 602c755 to e2e4281 Compare October 20, 2017 15:30
@spadgett
Copy link
Member Author

Rebased

@openshift-ci-robot openshift-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Oct 20, 2017
@spadgett
Copy link
Member Author

Upstream change has merged

@spadgett spadgett merged commit 8ecf1f2 into openshift:master Oct 20, 2017
@spadgett spadgett deleted the is-provider-display-name branch October 20, 2017 16:22
openshift-merge-robot added a commit to openshift/origin-web-console that referenced this pull request Oct 20, 2017
@openshift-merge-robot
Merge pull request #2304 from spadgett/provider-display-name
fe6a53a 
Automatic merge from submit-queue.

Update template annotations

- template.openshift.io/provider-display-name -> openshift.io/provider-display-Name
- template.openshift.io/documentation-url -> openshift.io/documentation-url
- template.openshift.io/support-url -> openshift.io/support-url

See also openshift/origin-web-catalog#487
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rhamilto rhamilto rhamilto approved these changes

@jwforres jwforres jwforres approved these changes

@jeff-phillips-18 jeff-phillips-18 jeff-phillips-18 approved these changes

Assignees
No one assigned
Labels
size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@spadgett @rhamilto @jwforres @jeff-phillips-18 @openshift-ci-robot