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

Fix subresource discovery and versioning #54683

Merged
merged 3 commits into from Oct 30, 2017
Merged

Fix subresource discovery and versioning #54683

merged 3 commits into from Oct 30, 2017

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Oct 27, 2017 •
edited

Fixes #54684
Related to #54586

Allows distinct subresource group/version/kind to be used for each version (gives us a path to move to autoscaling/v1 for apps, or policy/v1 for eviction, etc)

Added tests to ensure scale subresources have expected discovery info, and that the object returned matches discovery, and that the endpoint accepts the advertised version

Fixes discovery information for scale subresources in the apps API group

@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Oct 27, 2017
@liggitt liggitt mentioned this pull request Oct 27, 2017
Merged
@k8s-github-robot k8s-github-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 27, 2017
@liggitt
Copy link
Member Author

liggitt commented Oct 27, 2017

/retest

@liggitt liggitt force-pushed the subresource-gvk branch 2 times, most recently from e02360e to 2dbbea7 Compare October 27, 2017 15:51
deads2k
deads2k reviewed Oct 27, 2017
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/installer.go

// TODO: keep rid of extensions api group dependency here
// This keeps it doing what it was doing before, but it doesn't feel right.
if fqKind.Group == "extensions" && fqKind.Kind == "ThirdPartyResourceData" {
Copy link
Contributor

Choose a reason for hiding this comment

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

I bet that felt good.

@deads2k
Copy link
Contributor

deads2k commented Oct 27, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 27, 2017
@k8s-github-robot k8s-github-robot removed the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 28, 2017
@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Oct 28, 2017
@liggitt liggitt added this to the v1.8 milestone Oct 28, 2017
@k8s-cherrypick-bot
Copy link

Removing label cherrypick-candidate because no release milestone was set. This is an invalid state and thus this PR is not being considered for cherry-pick to any release branch. Please add an appropriate release milestone and then re-add the label.

@liggitt
Copy link
Member Author

liggitt commented Oct 28, 2017

Added integration test to ensure discovery matches the endpoint

@liggitt liggitt mentioned this pull request Oct 28, 2017
Merged
@deads2k
Copy link
Contributor

deads2k commented Oct 30, 2017

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Oct 30, 2017
@k8s-github-robot
Copy link

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, liggitt

Associated issue: 54684

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

@k8s-github-robot
Copy link

/test all [submit-queue is verifying that this PR is safe to merge]

@liggitt
Copy link
Member Author

liggitt commented Oct 30, 2017

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit 0c1f25f into kubernetes:master Oct 30, 2017
k8s-github-robot pushed a commit that referenced this pull request Oct 31, 2017
Merge pull request #54744 from liggitt/automated-cherry-pick-of-#5468…
a7be9c7 
…3-upstream-release-1.8

Automatic merge from submit-queue.

Automated cherry pick of #54683

Cherry pick of #54683 on release-1.8.

#54683: Specify correct subresource discovery info
@k8s-cherrypick-bot
Copy link

Commit found in the "release-1.8" branch appears to be this PR. Removing the "cherrypick-candidate" label. If this is an error find help to get your PR picked.

@liggitt liggitt deleted the subresource-gvk branch November 9, 2017 13:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deads2k deads2k deads2k left review comments

Assignees

@fabioy fabioy

@deads2k deads2k

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
v1.8
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@liggitt @deads2k @k8s-cherrypick-bot @k8s-github-robot @fabioy @k8s-ci-robot