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 conversion of literal null JSON values #104969

Merged
merged 2 commits into from Sep 14, 2021
Merged

Fix conversion of literal null JSON values #104969

merged 2 commits into from Sep 14, 2021

Conversation

liggitt
Copy link
Member

@liggitt liggitt commented Sep 13, 2021

What type of PR is this?

/kind bug

What this PR does / why we need it:

Fixes conversion of literal null values in CRD schema definitions and fixes non-propagation of errors in conversion.

Does this PR introduce a user-facing change?

kube-apiserver: Fixes handling of CRD schemas containing literal null values in enums.

/cc @sttts @lavalamp

@k8s-ci-robot k8s-ci-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/bug Categorizes issue or PR as related to a bug. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API sig/api-machinery Categorizes an issue or PR as relevant to SIG API Machinery. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/network Categorizes an issue or PR as relevant to SIG Network. approved Indicates a PR has been approved by an approver from all required OWNERS files. and removed do-not-merge/needs-sig Indicates an issue or PR lacks a `sig/foo` label and requires one. labels Sep 13, 2021
lavalamp
lavalamp reviewed Sep 13, 2021
View reviewed changes
staging/src/k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1/conversion_test.go
{
name: "null values",
in: `{"default":{"test":null},"enum":[null],"example":{"test":null}}`,
out: `{"default":{"test":null},"enum":[null],"example":{"test":null}}`,
Copy link
Member

Choose a reason for hiding this comment

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

We need to reject it if people are trying to make null an enum option. That cannot work, it will break assumptions that null means you are trying to clear the field. I can't tell if that is what is going on here or not.

Copy link
Member Author

Choose a reason for hiding this comment

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

a nullable value you want to constrain to a specific set of values or null must be able to include null as an enum value

Copy link
Member

Choose a reason for hiding this comment

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

A field being set to null is not a condition we can express, e.g. it can't round-trip. Null is an enum value the way that bald is a hair color. I would not expect to have to list null as a possible value in order to use field: null to delete the field.

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 can/does round-trip in custom resources...

Copy link
Member

Choose a reason for hiding this comment

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

OK I realize what is going on here now, I agree raw JSON should work like this, given that we have it at all, which I'm not super happy about...

@k8s-triage-robot
Copy link

This PR may require API review.

If so, when the changes are ready, complete the pre-review checklist and request an API review.

Status of requested reviews is tracked in the API Review project.

@lavalamp
Copy link
Member

/approve
/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

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

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 merged commit 9c147ba into kubernetes:master Sep 14, 2021
@k8s-ci-robot k8s-ci-robot added this to the v1.23 milestone Sep 14, 2021
@liggitt liggitt deleted the crd-error-validation branch September 14, 2021 01:31
@liggitt liggitt mentioned this pull request Sep 14, 2021
Merged
This was referenced Sep 14, 2021
Merged
Merged
@fedebongio
Copy link
Contributor

/triage accepted

@k8s-ci-robot k8s-ci-robot added triage/accepted Indicates an issue or PR is ready to be actively worked on. and removed needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Sep 14, 2021
@liggitt liggitt added the priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. label Sep 23, 2021
@k8s-ci-robot k8s-ci-robot removed the needs-priority Indicates a PR lacks a `priority/foo` label and requires one. label Sep 23, 2021
k8s-ci-robot added a commit that referenced this pull request Sep 27, 2021
@k8s-ci-robot
Merge pull request #104990 from liggitt/automated-cherry-pick-of-#104…
7ffe8e8 
…969-upstream-release-1.20

Automated cherry pick of #104969: Propagate conversion errors
k8s-ci-robot added a commit that referenced this pull request Sep 27, 2021
@k8s-ci-robot
Merge pull request #104989 from liggitt/automated-cherry-pick-of-#104…
1f8ce71 
…969-upstream-release-1.21

Automated cherry pick of #104969: Propagate conversion errors
k8s-ci-robot added a commit that referenced this pull request Sep 27, 2021
@k8s-ci-robot
Merge pull request #104988 from liggitt/automated-cherry-pick-of-#104…
39a3dc8 
…969-upstream-release-1.22

Automated cherry pick of #104969: Propagate conversion errors
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@lavalamp lavalamp lavalamp left review comments

@sttts sttts Awaiting requested review from sttts

Assignees

@lavalamp lavalamp

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. kind/api-change Categorizes issue or PR as related to adding, removing, or otherwise changing an API 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 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. sig/apps Categorizes an issue or PR as relevant to SIG Apps. sig/network Categorizes an issue or PR as relevant to SIG Network. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. triage/accepted Indicates an issue or PR is ready to be actively worked on.
Projects
None yet
Milestone
v1.23
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@liggitt @k8s-triage-robot @lavalamp @k8s-ci-robot @fedebongio