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

Automated cherry pick of #66249: fill in normal restmapping info with the legacy guess #67240

Merged
merged 1 commit into from
Aug 15, 2018
Merged

Automated cherry pick of #66249: fill in normal restmapping info with the legacy guess #67240

merged 1 commit into from
Aug 15, 2018

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Aug 10, 2018 •
edited
Loading

Fixes 1.11 part of #67235

Cherry pick of #66249 on release-1.11.

#66249: fill in normal restmapping info with the legacy guess

Fix creation of custom resources when the CRD contains non-conventional pluralization and subresources

@k8s-ci-robot k8s-ci-robot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. 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 Aug 10, 2018
@nikhita
Copy link
Member Author

nikhita commented Aug 10, 2018 •
edited
Loading

/sig api-machinery
/kind bug

/cc @deads2k @DirectXMan12 @sttts @caesarxuchao

/assign @foxish
for cherry-pick approval

This PR fixes how plural names are handled. From @DirectXMan12's comment in #65718 (comment):

Specifically, it's probably wrong to completely ignore the provided plural name if we don't have a singular name.

Also, this needs to be cherry-picked to fix #67235: custom resources having CRDs with non-conventional plurals and using subresources cannot be created.

@k8s-ci-robot k8s-ci-robot added sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. kind/bug Categorizes issue or PR as related to a bug. labels Aug 10, 2018
@nikhita nikhita mentioned this pull request Aug 10, 2018
Closed
@k8s-github-robot k8s-github-robot added the do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. label Aug 10, 2018
@nikhita
Copy link
Member Author

nikhita commented Aug 13, 2018

/cc @liggitt

@liggitt
Copy link
Member

liggitt commented Aug 13, 2018

/lgtm

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Aug 13, 2018
@liggitt
Copy link
Member

liggitt commented Aug 13, 2018

/assign @foxish

@k8s-ci-robot k8s-ci-robot added approved Indicates a PR has been approved by an approver from all required OWNERS files. 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 Aug 13, 2018
@nikhita nikhita mentioned this pull request Aug 14, 2018
Merged
@tamalsaha
Copy link
Member

@foxish , will this be part of v1.11.3 ?

@foxish foxish added cherrypick-candidate cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. and removed do-not-merge/cherry-pick-not-approved Indicates that a PR is not yet approved to merge into a release branch. labels Aug 15, 2018
@foxish
Copy link
Contributor

foxish commented Aug 15, 2018

@tamalsaha yes

@nikhita
Copy link
Member Author

nikhita commented Aug 15, 2018

/retest

yue9944882
yue9944882 approved these changes Aug 15, 2018
View reviewed changes
Copy link
Member

@yue9944882 yue9944882 left a comment

Choose a reason for hiding this comment

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

/lgtm

makes perfect sense

@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: liggitt, nikhita, yue9944882

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

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel 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]

@k8s-github-robot
Copy link

Automatic merge from submit-queue.

@k8s-github-robot k8s-github-robot merged commit 10ecc6d into kubernetes:release-1.11 Aug 15, 2018
@nikhita nikhita deleted the automated-cherry-pick-of-#66249-upstream-release-1.11 branch August 15, 2018 11:19
@nikhita nikhita mentioned this pull request Aug 21, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yue9944882 yue9944882 yue9944882 approved these changes

@lavalamp lavalamp Awaiting requested review from lavalamp

@sttts sttts Awaiting requested review from sttts

@caesarxuchao caesarxuchao Awaiting requested review from caesarxuchao

@deads2k deads2k Awaiting requested review from deads2k

@DirectXMan12 DirectXMan12 Awaiting requested review from DirectXMan12

@liggitt liggitt Awaiting requested review from liggitt

Assignees

@foxish foxish

@liggitt liggitt

@yue9944882 yue9944882

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. kind/bug Categorizes issue or PR as related to a bug. 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. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@nikhita @liggitt @tamalsaha @foxish @k8s-ci-robot @k8s-github-robot @yue9944882 @deads2k