Skip to content

[release-4.3] Bug 1780378: Implement Structural Schema for CRDs#1197

Merged
openshift-merge-robot merged 4 commits into
operator-framework:release-4.3from
awgreene:backport-structural-schema
Feb 27, 2020
Merged

[release-4.3] Bug 1780378: Implement Structural Schema for CRDs#1197
openshift-merge-robot merged 4 commits into
operator-framework:release-4.3from
awgreene:backport-structural-schema

Conversation

@awgreene
Copy link
Copy Markdown
Member

oc explain recently broke when OLM was rebased on top of version 1.16 of Kubernetes. This is due to the introduction of [CRDs Structural Schemas]([1] https://kubernetes.io/blog/2019/06/20/crd-structural-schema/). This PR updates OLMs CustomResourceDefinitions to include a structural schema.

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@awgreene: This pull request references Bugzilla bug 1780378, which is invalid:

  • expected the bug to target the "4.3.0" release, but it targets "4.3.z" 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:

Bug 1780378: Implement Structural Schema for CRDs

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 Dec 13, 2019
@openshift-ci-robot openshift-ci-robot added the size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. label Dec 13, 2019
@awgreene awgreene changed the title Bug 1780378: Implement Structural Schema for CRDs [release-4.3] Bug 1780378: Implement Structural Schema for CRDs Dec 13, 2019
@ecordell
Copy link
Copy Markdown
Member

/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels Dec 13, 2019
@ecordell
Copy link
Copy Markdown
Member

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Dec 13, 2019
@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@ecordell: This pull request references Bugzilla bug 1780378, 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-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Dec 13, 2019
@ecordell
Copy link
Copy Markdown
Member

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Dec 13, 2019
@ecordell
Copy link
Copy Markdown
Member

@awgreene IIRC, we just need to include the v1alpha2 OperatorGroup version and this is good to go

@openshift-ci-robot openshift-ci-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 20, 2019
@awgreene awgreene force-pushed the backport-structural-schema branch from 297050d to 75fb78f Compare December 26, 2019 08:15
@openshift-ci-robot openshift-ci-robot removed lgtm Indicates that a PR is ready to be merged. needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. labels Dec 26, 2019
@awgreene
Copy link
Copy Markdown
Member Author

/retest

@awgreene
Copy link
Copy Markdown
Member Author

awgreene commented Feb 2, 2020

@ecordell Regarding your comment:

@awgreene IIRC, we just need to include the v1alpha2 OperatorGroup version and this is good to go

This is a backport of a solution, should I create a new Bugzilla to add support for v1alpha2 to both 4.4 and 4.3? If so - could this PR be merged now or we could update it once the feature is implemented in 4.4.

@ecordell
Copy link
Copy Markdown
Member

ecordell commented Feb 4, 2020

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot removed the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 4, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@ecordell: This pull request references Bugzilla bug 1780378, which is invalid:

  • expected dependent Bugzilla bug 1769003 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
  • expected dependent Bugzilla bug 1798051 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.

@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 4, 2020
@awgreene
Copy link
Copy Markdown
Member Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@awgreene: This pull request references Bugzilla bug 1780378, which is invalid:

  • expected dependent Bugzilla bug 1769003 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ASSIGNED instead
  • expected dependent Bugzilla bug 1798051 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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.

This commit introduces a series of changes which will enable OLM to
implement Strucutral Schemas for its CRDs.
This commit updates OLM's Makefile to use the controller-gen tool to
generate the structural schemas for its CRDs.
This commit updates the CRDs defined in the manifest dir to include a
Structural Schema.
@awgreene awgreene force-pushed the backport-structural-schema branch from ef5c38c to fd7b5ab Compare February 20, 2020 20:49
The v1alpha2 version of the operatorgroup crd in the 4.4 OpenShift
release was not properly deprecated. Adding back that version to
the crd spc.
@awgreene awgreene force-pushed the backport-structural-schema branch from fd7b5ab to 4e5ffba Compare February 20, 2020 20:58
@dinhxuanvu
Copy link
Copy Markdown
Member

/retest

1 similar comment
@awgreene
Copy link
Copy Markdown
Member Author

/retest

@awgreene
Copy link
Copy Markdown
Member Author

/bugzilla refresh

@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@awgreene: This pull request references Bugzilla bug 1780378, which is invalid:

  • expected dependent Bugzilla bug 1769003 to be in one of the following states: VERIFIED, RELEASE_PENDING, CLOSED (ERRATA), but it is ON_QA 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.

@awgreene
Copy link
Copy Markdown
Member Author

/bugzilla refresh

1 similar comment
@awgreene
Copy link
Copy Markdown
Member Author

/bugzilla refresh

@openshift-ci-robot openshift-ci-robot added the bugzilla/valid-bug Indicates that a referenced Bugzilla bug is valid for the branch this PR is targeting. label Feb 24, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@awgreene: This pull request references Bugzilla bug 1780378, which is valid.

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-ci-robot openshift-ci-robot removed the bugzilla/invalid-bug Indicates that a referenced Bugzilla bug is invalid for the branch this PR is targeting. label Feb 24, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

@awgreene: This pull request references Bugzilla bug 1780378, which is valid.

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.

@exdx
Copy link
Copy Markdown
Contributor

exdx commented Feb 24, 2020

/lgtm

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

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: awgreene, ecordell, exdx

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

@ecordell
Copy link
Copy Markdown
Member

/hold cancel

@openshift-ci-robot openshift-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 24, 2020
@awgreene
Copy link
Copy Markdown
Member Author

@knobunc could you please consider applying the cherry-pick approved label to this PR?

Without this PR:

  • OLM's CRDs are structures blobs, which introduces security concerns.
  • CSVs created on a 4.3 cluster may fail validation once this PR is merged. It would be best to introduce this change as quickly as possible to affect as few operators as possible.

@eparis eparis added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Feb 26, 2020
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

3 similar comments
@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-bot
Copy link
Copy Markdown
Contributor

/retest

Please review the full test history for this PR and help us cut down flakes.

@openshift-merge-robot openshift-merge-robot merged commit 93f3461 into operator-framework:release-4.3 Feb 27, 2020
@openshift-ci-robot
Copy link
Copy Markdown
Collaborator

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

Details

In response to this:

[release-4.3] Bug 1780378: Implement Structural Schema for CRDs

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

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. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. lgtm Indicates that a PR is ready to be merged. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants