Skip to content

OCPBUGS-20164: Capabilities fix for Build CRD#1618

Merged
openshift-ci[bot] merged 3 commits intoopenshift:masterfrom
adambkaplan:build-crd-manifest-rename
Oct 12, 2023
Merged

OCPBUGS-20164: Capabilities fix for Build CRD#1618
openshift-ci[bot] merged 3 commits intoopenshift:masterfrom
adambkaplan:build-crd-manifest-rename

Conversation

@adambkaplan
Copy link
Copy Markdown
Contributor

@adambkaplan adambkaplan commented Oct 12, 2023

Marking the Build CRD as associated with the "Build" capability and "owned" by openshift-controller-manager-
operator. This means that its CRD manifest will be included in the ocm-o image, with the right annotations to mark it as part of the "Build" capability.

Follow up on #1616

@adambkaplan
OCPBUGS-20164: Capability Annotation for Build CRD
9179b05 
Add missing `capability.openshift.io/name` annotation to the Build cluster
configuration CRD. This will ensure that the config object for the Build
sub-system is not created when the Build capability is not enabled.
Also annotate the empty-resources Build CRD so that it is linked with the
appropriate cluster capability in the payload empty-resources.
@adambkaplan
Make Build CRD "owned" by ocm-o
cb13214 
Marking the Build CRD as "owned" by openshift-controller-manager-
operator. This means that its CRD manifest will be included in the ocm-o
image, with the right annotations to mark it as part of the "Build"
capability.
@adambkaplan
Remove Build from payload-command
9dd97b9 
Remove the Build CRD from the payload command's empty resources.
Rendering of the CRD will be done by ocm-o.
@openshift-ci-robot openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. labels Oct 12, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 12, 2023

@adambkaplan: This pull request references Jira Issue OCPBUGS-20164, which is valid.

3 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.15.0) matches configured target version for branch (4.15.0)
  • bug is in the state POST, which is one of the valid states (NEW, ASSIGNED, POST)

Requesting review from QA contact:
/cc @coreydaley

The bug has been updated to refer to the pull request using the external bug tracker.

Details

In response to this:

Marking the Build CRD as associated with the "Build" capability and "owned" by openshift-controller-manager-
operator. This means that its CRD manifest will be included in the ocm-o image, with the right annotations to mark it as part of the "Build" capability.

Follow up on #1616

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 openshift-ci Bot requested a review from coreydaley October 12, 2023 13:25
@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 12, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 12, 2023

Hello @adambkaplan! Some important instructions when contributing to openshift/api:
API design plays an important part in the user experience of OpenShift and as such API PRs are subject to a high level of scrutiny to ensure they follow our best practices. If you haven't already done so, please review the OpenShift API Conventions and ensure that your proposed changes are compliant. Following these conventions will help expedite the api review process for your PR.

@openshift-ci openshift-ci Bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 12, 2023
@openshift-ci openshift-ci Bot requested review from jwforres and soltysh October 12, 2023 13:31
@adambkaplan adambkaplan mentioned this pull request Oct 12, 2023
Merged
@adambkaplan
Copy link
Copy Markdown
Contributor Author

adambkaplan commented Oct 12, 2023

Also requires openshift/cluster-openshift-controller-manager-operator#306 for everything to work

@adambkaplan adambkaplan changed the title WIP - OCPBUGS-20164: Capabilities fix for Build CRD OCPBUGS-20164: Capabilities fix for Build CRD Oct 12, 2023
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Oct 12, 2023
@bparees
Copy link
Copy Markdown
Contributor

bparees commented Oct 12, 2023

/approve
/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Oct 12, 2023
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: adambkaplan, bparees

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 openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2023
@adambkaplan
Copy link
Copy Markdown
Contributor Author

adambkaplan commented Oct 12, 2023

Removing WIP - confirmed with the linked PRs that the Build CRD does not show up when a cluster installs with no capabilities.

$ oc get build
error: the server doesn't have a resource type "build"
$ oc api-resources | grep "build"
$

@bparees
Copy link
Copy Markdown
Contributor

bparees commented Oct 12, 2023

/override ci/prow/verify-crd-schema

job is complaining because we renamed+touched the CRD, but the complaints are not about the actual changes being made to the CRD and they are issues w/ the CRD that (at least mostly) can't/won't be fixed at this point (the CRD predates the api rules in question)

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 12, 2023

@bparees: Overrode contexts on behalf of bparees: ci/prow/verify-crd-schema

Details

In response to this:

/override ci/prow/verify-crd-schema

job is complaining because we renamed+touched the CRD, but the complaints are not about the actual changes being made to the CRD and they are issues w/ the CRD that (at least mostly) can't/won't be fixed at this point (the CRD predates the api rules in question)

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
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Oct 12, 2023

@adambkaplan: all tests passed!

Full PR test history. Your PR dashboard.

Details

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.

@openshift-ci openshift-ci Bot merged commit 8f468d7 into openshift:master Oct 12, 2023
@openshift-ci-robot
Copy link
Copy Markdown

openshift-ci-robot commented Oct 12, 2023

@adambkaplan: Jira Issue OCPBUGS-20164: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-20164 has not been moved to the MODIFIED state.

Details

In response to this:

Marking the Build CRD as associated with the "Build" capability and "owned" by openshift-controller-manager-
operator. This means that its CRD manifest will be included in the ocm-o image, with the right annotations to mark it as part of the "Build" capability.

Follow up on #1616

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.

@adambkaplan adambkaplan mentioned this pull request Oct 12, 2023
Merged
@eggfoobar eggfoobar mentioned this pull request Oct 13, 2023
Merged
@openshift-merge-robot
Copy link
Copy Markdown
Contributor

openshift-merge-robot commented Oct 17, 2023

Fix included in accepted release 4.15.0-0.nightly-2023-10-17-065657

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

Reviewers

@coreydaley coreydaley Awaiting requested review from coreydaley

@jwforres jwforres Awaiting requested review from jwforres

@soltysh soltysh Awaiting requested review from soltysh

Assignees

@bparees bparees

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@adambkaplan @openshift-ci-robot @bparees @openshift-merge-robot