Skip to content

Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled#24540

Merged
openshift-merge-robot merged 1 commit intoopenshift:release-3.11from
munnerz:crd-schema-type-at-root
Feb 14, 2020
Merged

Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled#24540
openshift-merge-robot merged 1 commit intoopenshift:release-3.11from
munnerz:crd-schema-type-at-root

Conversation

@munnerz
Copy link
Member

@munnerz munnerz commented Feb 14, 2020

This PR is a cherrypick from the upstream PR: kubernetes/kubernetes#65357

We're specifically requesting this change be cherrypicked back to release-3.11 as it currently prevents a single set of CRD resources being compatible with OpenShift 3.11 whilst also being considered 'structural' in OpenShift 4.x (and newer Kubernetes versions).

Without this patch, users will see errors like:

Error from server (Invalid): error when creating "cert-manager-openshift-v0.13.0.yaml": CustomResourceDefinition.apiextensions.k8s.io "certificaterequests.cert-manager.io" is invalid: spec.validation.openAPIV3Schema: Invalid value: apiextensions.JSONSchemaProps{ID:""

...

ensions.JSONSchemaDefinitions(nil), ExternalDocs:(*apiextensions.ExternalDocumentation)(nil), Example:(*apiextensions.JSON)(nil)}: must only have "properties", "required" or "description" at the root if the status subresource is enabled

when installing CRDs that enable the status resource that (correctly) specify type: object at the root of their CRD schema.

See also: cert-manager/cert-manager#2200

This patch applied clean from the upstream PR. This is my first contribution to origin so please let me know if I need to make any changes to how I've submitted this 😄

/assign @sttts

UPSTREAM: 65357: Allow more fields at root of CRD schema if status is…
4be15fd 
… enabled

Signed-off-by: James Munnelly <james.munnelly@jetstack.io>
@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 14, 2020
@sttts
Copy link
Contributor

sttts commented Feb 14, 2020

/lgtm
/approve

@openshift-ci-robot openshift-ci-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 14, 2020
@mfojtik
Copy link
Contributor

mfojtik commented Feb 14, 2020

/approve

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 14, 2020

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mfojtik, munnerz, sttts

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

The pull request process is described here

Details 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

@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 14, 2020
@munnerz munnerz changed the title UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled Feb 14, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 14, 2020

@munnerz: This pull request references Bugzilla bug 1803163, which is invalid:

  • expected Bugzilla bug 1803163 to depend on a bug in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but no dependents were found

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled

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.

@openshift-ci-robot openshift-ci-robot added the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 14, 2020
@munnerz
Copy link
Member Author

munnerz commented Feb 14, 2020

/bugzilla refresh

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 14, 2020

@munnerz: This pull request references Bugzilla bug 1803163, which is invalid:

  • expected dependent Bugzilla bug 1803171 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is NEW instead

Comment /bugzilla refresh to re-evaluate validity if changes to the Bugzilla bug are made, or edit the title of this pull request to link to a different bug.

Details

In response to this:

/bugzilla refresh

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.

@munnerz
Copy link
Member Author

munnerz commented Feb 14, 2020

I created a Bugzilla bug against 3.11, and then created another against 4.4 (?) and set it as a dependent of the first Bugzilla bug as per @sttts's help. I cannot set the State of either ticket to anything other than CLOSED or NEW so I think that's all I can do here 😅 if there's any additional docs on how this all works that someone can point me to that'd be great 💯

@sttts
Copy link
Contributor

sttts commented Feb 14, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. and removed bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. labels Feb 14, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 14, 2020

@sttts: This pull request references Bugzilla bug 1803163, which is valid. The bug has been moved to the POST state. The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

/bugzilla refresh

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.

@openshift-merge-robot openshift-merge-robot merged commit b39752b into openshift:release-3.11 Feb 14, 2020
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 14, 2020

@munnerz: All pull requests linked via external trackers have merged. Bugzilla bug 1803163 has been moved to the MODIFIED state.

Details

In response to this:

Bug 1803163: UPSTREAM: 65357: Allow more fields at root of CRD schema if status is enabled

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.

@munnerz munnerz deleted the crd-schema-type-at-root branch February 14, 2020 16:03
@DTMad DTMad mentioned this pull request Apr 14, 2020
Closed
@jkroepke jkroepke mentioned this pull request Apr 16, 2020
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@sjenning sjenning Awaiting requested review from sjenning

@timlnx timlnx Awaiting requested review from timlnx

Assignees

@sttts sttts

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@munnerz @sttts @mfojtik @openshift-ci-robot @openshift-merge-robot