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

strip template prefix from TSB annotations #16925

Merged
merged 1 commit into from
Oct 20, 2017
Merged

strip template prefix from TSB annotations #16925

merged 1 commit into from
Oct 20, 2017

Conversation

bparees
Copy link
Contributor

@bparees bparees commented Oct 18, 2017 •
edited
Loading

fixes #16755

@openshift-merge-robot openshift-merge-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 18, 2017
@openshift-ci-robot openshift-ci-robot added the size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. label Oct 18, 2017
@bparees
Copy link
Contributor Author

bparees commented Oct 18, 2017

/assign @jim-minter
/unassign @gabemontero @danwinship

@jim-minter ptal, i will need to update the upstream templates too but i wanted to at least ensure all the local ones are consistent with the new code first. Once this merges i'll update the upstream templates.

@bparees
Copy link
Contributor Author

bparees commented Oct 18, 2017

/retest

1 similar comment
@bparees
Copy link
Contributor Author

bparees commented Oct 18, 2017

/retest

@spadgett spadgett mentioned this pull request Oct 18, 2017
Merged
@jim-minter
Copy link
Contributor

/lgtm

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Oct 18, 2017
@openshift-merge-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bparees, jim-minter

The full list of commands accepted by this bot can be found here.

Needs approval from an approver in each of these OWNERS Files:

You can indicate your approval by writing /approve in a comment
You can cancel your approval by writing /approve cancel in a comment

@jim-minter
Copy link
Contributor

@bparees have lgtm'd this, but wondering why you didn't straight remove the consts from pkg/template/apis/template/constants.go?

@bparees
Copy link
Contributor Author

bparees commented Oct 18, 2017

@bparees have lgtm'd this, but wondering why you didn't straight remove the consts from pkg/template/apis/template/constants.go?

i'm leaving support for the old values in the TSB until i get the upstream templates updates to not use it. some loose semblance of backwards compatibility.

but i'll remove it before 3.7 ships.

@rcernich fyi, not sure if your templates have the template.openshift.io annotations in them, but we're renaming them as seen here.

@bparees bparees added the kind/bug Categorizes issue or PR as related to a bug. label Oct 18, 2017
@bparees bparees mentioned this pull request Oct 18, 2017
Merged
@spadgett spadgett mentioned this pull request Oct 19, 2017
Merged
@openshift-merge-robot openshift-merge-robot removed the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2017
@bparees bparees added the lgtm Indicates that a PR is ready to be merged. label Oct 19, 2017
@rcernich
Copy link

@bparees, will the old annotations continue to work? Which version is this change targeted at?

@bparees
Copy link
Contributor Author

bparees commented Oct 19, 2017

@bparees, will the old annotations continue to work? Which version is this change targeted at?

@rcernich the old annotations will not continue to work, we're just changing the behavior since we never supported the old behavior. this will be the first time the TSB GAs. this will be for 3.7.

@rcernich
Copy link

@bparees, thanks. Looks like we're not using the "template" prefix, so hopefully, we're good to go.

@openshift-bot
Copy link
Contributor

/retest

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

@bparees
Copy link
Contributor Author

bparees commented Oct 20, 2017

/retest

@openshift-merge-robot
Copy link
Contributor

Automatic merge from submit-queue (batch tested with PRs 16943, 16872, 16916, 16863, 16925).

@openshift-merge-robot openshift-merge-robot merged commit a8af212 into openshift:master Oct 20, 2017
@bparees bparees deleted the tsb_displayname branch October 25, 2017 07:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jim-minter jim-minter

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/bug Categorizes issue or PR as related to a bug. lgtm Indicates that a PR is ready to be merged. size/XL Denotes a PR that changes 500-999 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Make template.openshift.io/provider-display-name annotation generic
8 participants
@bparees @jim-minter @openshift-merge-robot @rcernich @openshift-bot @danwinship @gabemontero @openshift-ci-robot