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

UPSTREAM: 42275: discovery restmapping should always prefer /v1 #13727

Merged
merged 1 commit into from
Apr 12, 2017

Conversation

mfojtik
Copy link
Contributor

@mfojtik mfojtik commented Apr 12, 2017

@liggitt @deads2k @sttts PTAL

I tested this manually and it returns the v1.Route object (so describer works as expected).

Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1441089

@@ -45,6 +45,10 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
var resourcePriority []unversioned.GroupVersionResource
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: these declaration can be dropped

Copy link
Contributor Author

Choose a reason for hiding this comment

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

i wanted to follow the original commit as close as possible ;-)

@@ -45,6 +45,10 @@ func NewRESTMapper(groupResources []*APIGroupResources, versionInterfaces meta.V
var resourcePriority []unversioned.GroupVersionResource
var kindPriority []unversioned.GroupVersionKind

// /v1 is special. It should always come first
Copy link
Contributor

Choose a reason for hiding this comment

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

// new servers will report non-core apigroups for origin resources. Because this client does not know about
// them yet, we enforce that all origin resources resolve to /v1 kinds.

@sttts
Copy link
Contributor

sttts commented Apr 12, 2017

Looks good. Two cosmetic comments.

@mfojtik mfojtik force-pushed the pick-restmapper-fix branch from 23d91d4 to 256a705 Compare April 12, 2017 09:01
@mfojtik
Copy link
Contributor Author

mfojtik commented Apr 12, 2017

@sttts comments addressed

@mfojtik
Copy link
Contributor Author

mfojtik commented Apr 12, 2017

[test]

@openshift-bot
Copy link
Contributor

Evaluated for origin test up to 256a705

@openshift-bot
Copy link
Contributor

continuous-integration/openshift-jenkins/test SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/697/) (Base Commit: efa3fe6)

@mfojtik
Copy link
Contributor Author

mfojtik commented Apr 12, 2017

[merge]

@openshift-bot
Copy link
Contributor

openshift-bot commented Apr 12, 2017

continuous-integration/openshift-jenkins/merge SUCCESS (https://ci.openshift.redhat.com/jenkins/job/test_pull_request_origin/697/) (Base Commit: efa3fe6) (Image: devenv-rhel7_6137)

@openshift-bot
Copy link
Contributor

Evaluated for origin merge up to 256a705

@openshift-bot openshift-bot merged commit 8143f55 into openshift:release-1.5 Apr 12, 2017
@mfojtik mfojtik deleted the pick-restmapper-fix branch September 5, 2018 21:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants