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.

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

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

Merged

Conversation

adambkaplan
Copy link
Contributor

@adambkaplan adambkaplan commented Oct 12, 2023

Rename Build CRD yaml so that it is not included in cluster-config-operator's set of manifests. Build CRD will be owned and managed by openshift-controller-manager-operator moving forward.

Manual cherry-pick of #360, may require openshift/cluster-openshift-controller-manager-operator#307 to land first.

@openshift-ci-robot 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 12, 2023
@openshift-ci-robot
Copy link

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

  • expected the bug to target the "4.14.0" version, but it targets "4.15" instead
  • expected Jira Issue OCPBUGS-20164 to depend on a bug targeting a version in 4.15.0 and in one of the following states: MODIFIED, ON_QA, VERIFIED, but no dependents were found

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.

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 capbility 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.

@bparees bparees changed the title OCPBUGS-20164: Add Capability for Build CRD OCPBUGS-20439: Add Capability for Build CRD Oct 12, 2023
@openshift-ci-robot
Copy link

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

  • expected dependent Jira Issue OCPBUGS-20164 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is New instead

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.

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 capbility 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.

@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

/jira refresh

@openshift-ci-robot
Copy link

@bparees: This pull request references Jira Issue OCPBUGS-20439, which is invalid:

  • expected dependent Jira Issue OCPBUGS-20164 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is New instead

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.

In response to this:

/jira 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.

@bparees bparees added backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. 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
@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

manually labeling this as valid-bug, we're going to merge out of order (merge to 4.14 first, then follow with 4.15) due to time constraints for getting this into 4.14.0. There is ample time to avoid any regression concerns.

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

bparees commented Oct 12, 2023

/hold

needs to be updated w/ a proper bump from openshift/api once openshift/api#1617 lands

@openshift-ci 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
@wking
Copy link
Member

wking commented Oct 12, 2023

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

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 12, 2023

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

  • periodic-ci-openshift-release-master-ci-4.14-e2e-aws-ovn-no-capabilities

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/32902a40-68a7-11ee-95a8-cce051792342-0

@wking
Copy link
Member

wking commented Oct 12, 2023

/payload-job run:

$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/openshift-cluster-config-operator-363-ci-4.14-e2e-aws-ovn-no-capabilities/1712294465357484032/artifacts/e2e-aws-ovn-no-capabilities/gather-must-gather/artifacts/must-gather.tar | tar tvz | grep builds.config
-rw------- 1006330000/root   26768 2023-10-11 21:03 registry-build01-ci-openshift-org-ci-op-0v5f3hgv-stable-sha256-9d4dcf33eebdeb01573a70cc4aa0f7f9e492a5f2d5cfdfd410d5bd00766302f8/cluster-scoped-resources/apiextensions.k8s.io/customresourcedefinitions/builds.config.openshift.io.yaml
$ curl -s https://gcsweb-ci.apps.ci.l2s4.p1.openshiftapps.com/gcs/origin-ci-test/logs/openshift-cluster-config-operator-363-ci-4.14-e2e-aws-ovn-no-capabilities/1712294465357484032/artifacts/e2e-aws-ovn-no-capabilities/gather-must-gather/artifacts/must-gather.tar | tar xOz registry-build01-ci-openshift-org-ci-op-0v5f3hgv-stable-sha256-9d4dcf33eebdeb01573a70cc4aa0f7f9e492a5f2d5cfdfd410d5bd00766302f8/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-12T02:48:10Z 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.

Rename Build CRD yaml so that it is not included in
cluster-config-operator's set of manifests.
Remove Build CRD empty resource so it doesn't get included in manifests.
@adambkaplan adambkaplan changed the title OCPBUGS-20439: Add Capability for Build CRD [release-4.14] OCPBUGS-20439: Remove Build CRD from cluster-config-operator Oct 12, 2023
@openshift-ci-robot
Copy link

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

  • expected dependent Jira Issue OCPBUGS-20164 to be in one of the following states: MODIFIED, ON_QA, VERIFIED, but it is POST instead

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.

Retaining the jira/valid-bug label as it was manually added.

In response to this:

Rename Build CRD yaml so that it is not included in cluster-config-operator's set of manifests. Build CRD will be owned and managed by openshift-controller-manager-operator moving forward.

Manual cherry-pick of #360

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 changed the title [release-4.14] OCPBUGS-20439: Remove Build CRD from cluster-config-operator [release-4.14] OCPBUGS-20439: Remove Build CRD Oct 12, 2023
@bparees bparees added the cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. label Oct 12, 2023
@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

@bparees bparees removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Oct 12, 2023
@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

/lgtm

@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

/retest-required

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

openshift-ci bot commented Oct 12, 2023

[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

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

@bparees
Copy link
Contributor

bparees commented Oct 12, 2023

/retest-required

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 13, 2023

@adambkaplan: all tests passed!

Full PR test history. Your PR dashboard.

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 fa99c08 into openshift:release-4.14 Oct 13, 2023
10 checks passed
@openshift-ci-robot
Copy link

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

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

In response to this:

Rename Build CRD yaml so that it is not included in cluster-config-operator's set of manifests. Build CRD will be owned and managed by openshift-controller-manager-operator moving forward.

Manual cherry-pick of #360, may require openshift/cluster-openshift-controller-manager-operator#307 to land 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
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2023-10-13-032002

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.14.0-0.nightly-2023-10-13-073537

@openshift-merge-robot
Copy link
Contributor

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
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. cherry-pick-approved Indicates a cherry-pick PR into a release branch has been approved by the release branch manager. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants