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

apiextensions: allow Description at root with status subresource #64766

Merged
merged 1 commit into from
Jun 5, 2018
Merged

apiextensions: allow Description at root with status subresource #64766

merged 1 commit into from
Jun 5, 2018

Conversation

nikhita
Copy link
Member

@nikhita nikhita commented Jun 5, 2018 •
edited

Allows Description at the root of the schema when the status subresource is enabled.

Release note:
I'll update the original PR, which allowed Required, to de-duplicate the release notes.

NONE

/assign sttts

@k8s-ci-robot k8s-ci-robot added the release-note-none Denotes a PR that doesn't merit a release note. label Jun 5, 2018
@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. labels Jun 5, 2018
@k8s-ci-robot k8s-ci-robot requested review from enisoc and sttts June 5, 2018 13:35
sttts
sttts reviewed Jun 5, 2018
View reviewed changes
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/validation/validation.go
@@ -300,8 +300,8 @@ func ValidateCustomResourceDefinitionValidation(customResourceValidation *apiext
continue
}

if name := v.Type().Field(i).Name; name != "Properties" && name != "Required" {
allErrs = append(allErrs, field.Invalid(fldPath.Child("openAPIV3Schema"), *schema, fmt.Sprintf(`must only have "properties" or "required" at the root if the status subresource is enabled`)))
if name := v.Type().Field(i).Name; name != "Properties" && name != "Required" && name != "Description" {
Copy link
Contributor

Choose a reason for hiding this comment

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

we should start to have a slice when we add the next one

Copy link
Member Author

Choose a reason for hiding this comment

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

👍

@sttts
Copy link
Contributor

sttts commented Jun 5, 2018

/lgtm
/approve

@k8s-ci-robot k8s-ci-robot added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jun 5, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: nikhita, sttts

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-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 5, 2018
@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

I think this needs lots of other labels.

/kind bug
/sig api-machinery
/area custom-resources

@k8s-ci-robot k8s-ci-robot added kind/bug Categorizes issue or PR as related to a bug. sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. area/custom-resources labels Jun 5, 2018
@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

And the milestone + status/approved-for-milestone.

@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

@sttts Can you add the milestone?

@sttts sttts added this to the v1.11 milestone Jun 5, 2018
@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

/priority important-soon

@k8s-ci-robot k8s-ci-robot added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Jun 5, 2018
@sttts
Copy link
Contributor

sttts commented Jun 5, 2018

/status approved-for-milestone

@k8s-ci-robot
Copy link
Contributor

You must be a member of the kubernetes/kubernetes-milestone-maintainers github team to add status labels.

@sslavic sslavic mentioned this pull request Jun 5, 2018
Closed
This was referenced Jun 5, 2018
Merged
Closed
@dims
Copy link
Member

dims commented Jun 5, 2018

looks like @sttts is ok to get this in

/status approved-for-milestone

@k8s-github-robot
Copy link

[MILESTONENOTIFIER] Milestone Pull Request: Up-to-date for process

@nikhita @sttts

Pull Request Labels
  • sig/api-machinery: Pull Request will be escalated to these SIGs if needed.
  • priority/important-soon: Escalate to the pull request owners and SIG owner; move out of milestone after several unsuccessful escalation attempts.
  • kind/bug: Fixes a bug discovered during the current release.
Help

@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

Thanks @dims!

@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

/retest

1 similar comment
@nikhita
Copy link
Member Author

nikhita commented Jun 5, 2018

/retest

@k8s-github-robot
Copy link

Automatic merge from submit-queue (batch tested with PRs 64276, 64094, 64719, 64766, 64750). If you want to cherry-pick this change to another branch, please follow the instructions here.

@k8s-github-robot k8s-github-robot merged commit c279578 into kubernetes:master Jun 5, 2018
@nikhita nikhita deleted the allow-description-at-root branch June 5, 2018 18:44
@jennybuckley
Copy link

/cc @mbohlool

@nikhita nikhita mentioned this pull request Jun 14, 2018
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@sttts sttts sttts left review comments

@enisoc enisoc Awaiting requested review from enisoc

@mbohlool mbohlool Awaiting requested review from mbohlool

Assignees

@sttts sttts

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/custom-resources 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. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. release-note-none Denotes a PR that doesn't merit a release note. 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
v1.11
Development

Successfully merging this pull request may close these issues.

None yet
6 participants
@nikhita @sttts @k8s-ci-robot @dims @k8s-github-robot @jennybuckley