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

Add support for submitting/receiving CRD objects as yaml #58260

Merged
merged 3 commits into from
Jan 16, 2018
Merged

Add support for submitting/receiving CRD objects as yaml #58260

merged 3 commits into from
Jan 16, 2018

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Jan 14, 2018 •
edited
Loading

Fixes #37455

Custom resources can now be submitted to and received from the API server in application/yaml format, consistent with other API resources.

@k8s-ci-robot k8s-ci-robot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. labels Jan 14, 2018
@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 Jan 14, 2018
This was referenced Jan 15, 2018
Closed
Merged
@k8s-ci-robot k8s-ci-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 16, 2018
@liggitt liggitt changed the title WIP - Add support for submitting/receiving CRD objects as yaml Add support for submitting/receiving CRD objects as yaml Jan 16, 2018
@k8s-ci-robot k8s-ci-robot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 16, 2018
@liggitt
Copy link
Member Author

liggitt commented Jan 16, 2018

Updated with integration test:

  • ensures create/update/delete/get/list accept/return YAML
  • ensures patch/watch reject YAML
  • ensures error cases return v1 Status objects

@liggitt
Copy link
Member Author

liggitt commented Jan 16, 2018

cc @kubernetes/sig-api-machinery-pr-reviews

@k8s-ci-robot k8s-ci-robot added the sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. label Jan 16, 2018
sttts
sttts reviewed Jan 16, 2018
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
// TODO: handle this in negotiation
contentType := req.Header.Get("Content-Type")
// Remove "; charset=" if included in header.
if idx := strings.Index(contentType, ";"); idx > 0 {
Copy link
Contributor

Choose a reason for hiding this comment

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

nit: >= 0

Copy link
Member Author

Choose a reason for hiding this comment

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

Preexisting, and I don't think so… leading ; isn't a valid mime type attribute

sttts
sttts reviewed Jan 16, 2018
View reviewed changes
staging/src/k8s.io/apiserver/pkg/endpoints/handlers/patch.go
return func(w http.ResponseWriter, req *http.Request) {
// Do this first, otherwise name extraction can fail for unrecognized content types
// TODO: handle this in negotiation
Copy link
Contributor

Choose a reason for hiding this comment

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

what's meant with the TODO? (I know it pre-existed)

Copy link
Member Author

Choose a reason for hiding this comment

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

It means to switch this to follow a similar flow with the negotiating serializer, that's just not built for dealing with patch mime types as-is

Copy link
Contributor

Choose a reason for hiding this comment

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

was reading "in negation". negotiation makes more sense actually.

@sttts
Copy link
Contributor

sttts commented Jan 16, 2018

Looks good.

@deads2k
Copy link
Contributor

deads2k commented Jan 16, 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 Jan 16, 2018
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

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

Associated issue: #37455

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

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

@k8s-ci-robot
Copy link
Contributor

k8s-ci-robot commented Jan 16, 2018 •
edited
Loading

@liggitt: The following test failed, say /retest to rerun them all:

Test name Commit Details Rerun command
pull-kubernetes-unit 59c305b link /test pull-kubernetes-unit

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@k8s-github-robot
Copy link

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

@k8s-github-robot k8s-github-robot merged commit a7c65d2 into kubernetes:master Jan 16, 2018
@timothysc timothysc removed their assignment Jan 16, 2018
@liggitt liggitt deleted the crd-yaml branch January 17, 2018 05:09
@jennybuckley
Copy link

@lavalamp

@brokenmass brokenmass mentioned this pull request Mar 13, 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

Assignees

@sttts sttts

@deads2k deads2k

@nikhita nikhita

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. 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/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@liggitt @sttts @deads2k @k8s-ci-robot @k8s-github-robot @jennybuckley @timothysc @nikhita