OCPBUGS-20164: Remove Build CRD by adambkaplan · Pull Request #360 · openshift/cluster-config-operator

adambkaplan · 2023-10-11T15:50:55Z

The Build CRD is no longer included in cluster-config-operator's manifests. This will be owned and deployed by
openshift-controller-manager-operator moving forward.

Might depend on openshift/cluster-openshift-controller-manager-operator#306 merging first.

openshift-ci-robot · 2023-10-11T15:50:57Z

@adambkaplan: No Jira issue with key OCPBUGS-201614 exists in the tracker at https://issues.redhat.com/.
Once a valid jira issue is referenced in the title of this pull request, request a refresh with /jira refresh.

Details

In response to this:

Add missing capability annotation for the Build CRD. This ensures the Build cluster config CRD will not be created if the respective capability is not 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 · 2023-10-11T15:51:30Z

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

expected the bug to target the "4.15.0" version, but no target version was set

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

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

Details

In response to this:

Add missing capability annotation for the Build CRD. This ensures the Build cluster config CRD will not be created if the respective capability is not 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.

adambkaplan · 2023-10-11T17:50:43Z

@bparees @wking my manual test results of this PR with aws,no-capabilities cluster bot:

No build.openshift.io/v1 API resources
No custom resource instances of build.config.openshift.io/v1
Custom resource definition of build.config.openshift.io still exsits.

$ oc get build -A
No resources found
$ oc get build.openshift.io
error: the server doesn't have a resource type "build"
$ oc get build.config.openshift.io
No resources found
$ oc get crds | grep "build"
builds.config.openshift.io                                        2023-10-11T17:13:28Z
$ oc api-resources | grep build
builds                                                                                                                       config.openshift.io/v1                        false        Build

Do we ship this as an early z-stream bug fix, and deal with the builds.config.openshift.io CRD in 4.15?

adambkaplan · 2023-10-11T21:29:06Z

@bparees @wking same result after adding the annotation to the empty-resources in openshift/api.

At this point we're past "quick fix" and entering "there's missing logic." Since we already have cruft related to the builds capability (see https://issues.redhat.com/browse/BUILD-726), do we merge this in as a quick fix and deal with the build CRD creation in 4.15?

wking · 2023-10-11T22:55:53Z

/payload-job periodic-ci-openshift-release-master-ci-4.15-e2e-aws-ovn-no-capabilities

openshift-ci · 2023-10-11T22:55:56Z

@wking: trigger 1 job(s) for the /payload-(job|aggregate) command

periodic-ci-openshift-release-master-ci-4.15-e2e-aws-ovn-no-capabilities

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/550f7a30-6889-11ee-87b8-cc3b06b6aba4-0

wking · 2023-10-12T06:10:32Z

/payload-job run:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/openshift-cluster-config-operator-360-ci-4.15-e2e-aws-ovn-no-capabilities/1712240646447697920/artifacts/e2e-aws-ovn-no-capabilities/gather-must-gather/artifacts/must-gather.tar | tar xOz 60d093a4c518ddd700e5fad91954489579777836e49c5249bfdb28dc53fcaf01/cluster-scoped-resources/apiextensions.k8s.io/customresourcedefinitions/builds.config.openshift.io.yaml | yaml2json | jq -r '.metadata.managedFields[] | select(.subresource != "status") | .time + " " + .operation + " " + .manager'
2023-10-11T23:12:04Z Update cluster-bootstrap

So this is still getting into the cluster at bootstrap time, via the config render command, and we'll need something like my #362 ugly hack, or a nicer way to tell the config operator "the Build CRD and empty custom resource don't need to be rendered at bootstrap-time". As seen in #362, the CVO will still pick up the manifests for these resources from the config operator's /manifests/... and ensure they get into the cluster before we declare install-complete. And there's nothing bootstrap-time that needs them there before the CVO pushes them in.

adambkaplan · 2023-10-12T17:10:44Z

Paired with openshift/cluster-openshift-controller-manager-operator#306, and bumping api with openshift/api#1618, this removes the Build CRD.

Update openshift/api so that the Build CRD is no longer included in cluster-config-operator's manifests. This will be owned and deployed by openshift-controller-manager-operator moving forward.

Remove Build CRD empty resource so it doesn't get included in manifests.

openshift-ci-robot · 2023-10-12T18:46:46Z

@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:

The Build CRD is no longer included in cluster-config-operator's manifests. This will be owned and deployed by
openshift-controller-manager-operator moving forward.

Might depend on openshift/cluster-openshift-controller-manager-operator#306 merging first.

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.

bparees · 2023-10-12T19:57:40Z

/hold

waiting for openshift/cluster-openshift-controller-manager-operator#306

bparees · 2023-10-12T20:52:23Z

/hold cancel

bparees · 2023-10-12T20:54:41Z

/lgtm

bparees · 2023-10-12T20:56:17Z

/retest required

openshift-ci · 2023-10-12T20:56:33Z

@bparees: The /retest command does not accept any targets.
The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial
/test e2e-aws-serial-techpreview
/test e2e-upgrade
/test images
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-azure
/test e2e-gcp

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cluster-config-operator-master-e2e-aws-ovn
pull-ci-openshift-cluster-config-operator-master-e2e-aws-ovn-techpreview
pull-ci-openshift-cluster-config-operator-master-e2e-aws-serial
pull-ci-openshift-cluster-config-operator-master-e2e-aws-serial-techpreview
pull-ci-openshift-cluster-config-operator-master-e2e-upgrade
pull-ci-openshift-cluster-config-operator-master-images
pull-ci-openshift-cluster-config-operator-master-unit
pull-ci-openshift-cluster-config-operator-master-verify
pull-ci-openshift-cluster-config-operator-master-verify-deps

Details

In response to this:

/retest required

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.

bparees · 2023-10-12T20:57:14Z

/retest-required

openshift-ci · 2023-10-12T20:57:17Z

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

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:

OWNERS

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 · 2023-10-12T20:58:34Z

/retest-required

Remaining retests: 0 against base HEAD 43c02ba and 2 for PR HEAD bb52b1b in total

bparees · 2023-10-12T21:31:34Z

/retest-required

wking · 2023-10-12T22:44:06Z

build-cluster capacity flake:

/test ci/prow/e2e-aws-serial-techpreview

openshift-ci · 2023-10-12T22:44:13Z

@wking: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test e2e-aws-ovn
/test e2e-aws-ovn-techpreview
/test e2e-aws-serial
/test e2e-aws-serial-techpreview
/test e2e-upgrade
/test images
/test unit
/test verify
/test verify-deps

The following commands are available to trigger optional jobs:

/test e2e-azure
/test e2e-gcp

Use /test all to run the following jobs that were automatically triggered:

pull-ci-openshift-cluster-config-operator-master-e2e-aws-ovn
pull-ci-openshift-cluster-config-operator-master-e2e-aws-ovn-techpreview
pull-ci-openshift-cluster-config-operator-master-e2e-aws-serial
pull-ci-openshift-cluster-config-operator-master-e2e-aws-serial-techpreview
pull-ci-openshift-cluster-config-operator-master-e2e-upgrade
pull-ci-openshift-cluster-config-operator-master-images
pull-ci-openshift-cluster-config-operator-master-unit
pull-ci-openshift-cluster-config-operator-master-verify
pull-ci-openshift-cluster-config-operator-master-verify-deps

Details

In response to this:

build-cluster capacity flake:

/test ci/prow/e2e-aws-serial-techpreview

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.

wking · 2023-10-12T22:44:41Z

/test e2e-aws-serial-techpreview

bparees · 2023-10-12T22:58:04Z

/test e2e-aws-serial-techpreview

bparees · 2023-10-12T23:18:06Z

/test e2e-aws-serial-techpreview

bparees · 2023-10-12T23:44:49Z

/test e2e-aws-serial-techpreview

openshift-ci · 2023-10-13T02:16:11Z

@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-robot · 2023-10-13T02:20:43Z

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

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

Details

In response to this:

The Build CRD is no longer included in cluster-config-operator's manifests. This will be owned and deployed by
openshift-controller-manager-operator moving forward.

Might depend on openshift/cluster-openshift-controller-manager-operator#306 merging first.

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 · 2023-10-17T13:35:21Z

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

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 11, 2023

adambkaplan changed the title ~~WIP - OCPBUGS-201614: Add Capability for Build CRD~~ WIP - OCPBUGS-20164: Add Capability for Build CRD Oct 11, 2023

openshift-ci-robot added jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 11, 2023

openshift-ci Bot requested review from soltysh and tkashem October 11, 2023 15:56

adambkaplan mentioned this pull request Oct 11, 2023

OCPBUGS-20164: Capability Annotation for Build CRD openshift/api#1616

Closed

wking mentioned this pull request Oct 11, 2023

Drop Build capability #362

Closed

adambkaplan force-pushed the build-capability branch 2 times, most recently from 0575ac5 to 4e713b9 Compare October 12, 2023 14:23

openshift-ci-robot mentioned this pull request Oct 12, 2023

OCPBUGS-20164: Capabilities fix for Build CRD openshift/api#1618

Merged

adambkaplan mentioned this pull request Oct 12, 2023

OCPBUGS-20164: Include Build CRD in manifests openshift/cluster-openshift-controller-manager-operator#306

Merged

adambkaplan added 2 commits October 12, 2023 14:44

bump(openshift/api):

40a9f3f

Update openshift/api so that the Build CRD is no longer included in cluster-config-operator's manifests. This will be owned and deployed by openshift-controller-manager-operator moving forward.

OCPBUGS-20164: Remove Build CRD from empty-resources

bb52b1b

Remove Build CRD empty resource so it doesn't get included in manifests.

adambkaplan force-pushed the build-capability branch from 4e713b9 to bb52b1b Compare October 12, 2023 18:44

adambkaplan changed the title ~~WIP - OCPBUGS-20164: Add Capability for Build CRD~~ OCPBUGS-20164: Add Capability for Build CRD Oct 12, 2023

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

adambkaplan changed the title ~~OCPBUGS-20164: Add Capability for Build CRD~~ OCPBUGS-20164: Remove Build CRD Oct 12, 2023

openshift-ci-robot added jira/valid-bug Indicates that a referenced Jira bug is valid for the branch this PR is targeting. and removed jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. labels Oct 12, 2023

openshift-ci Bot requested a review from coreydaley October 12, 2023 18:46

adambkaplan mentioned this pull request Oct 12, 2023

[release-4.14] OCPBUGS-20439: Remove Build CRD #363

Merged

openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2023

bparees added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 12, 2023

openshift-ci Bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2023

openshift-ci Bot assigned bparees Oct 12, 2023

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

openshift-ci Bot merged commit 5b16d2c into openshift:master Oct 13, 2023

Conversation

adambkaplan commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci-robot commented Oct 11, 2023

Uh oh!

openshift-ci-robot commented Oct 11, 2023

Uh oh!

adambkaplan commented Oct 11, 2023

Uh oh!

adambkaplan commented Oct 11, 2023

Uh oh!

wking commented Oct 11, 2023

Uh oh!

openshift-ci Bot commented Oct 11, 2023

Uh oh!

wking commented Oct 12, 2023

Uh oh!

adambkaplan commented Oct 12, 2023

Uh oh!

openshift-ci-robot commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

openshift-ci Bot commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

openshift-ci Bot commented Oct 12, 2023

Uh oh!

openshift-ci-robot commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

wking commented Oct 12, 2023

Uh oh!

openshift-ci Bot commented Oct 12, 2023

Uh oh!

wking commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

bparees commented Oct 12, 2023

Uh oh!

openshift-ci Bot commented Oct 13, 2023

Uh oh!

openshift-ci-robot commented Oct 13, 2023

Uh oh!

openshift-merge-robot commented Oct 17, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

adambkaplan commented Oct 11, 2023 •

edited

Loading