Skip to content

Conversation

@DavidHurta
Copy link
Contributor

@DavidHurta DavidHurta commented Oct 13, 2025

Manual cherry-picking of commits to bring the #1232 into 4.20.

I am cherry-picking the commits from main.

No other changes regarding imported modules were done between the branch cut-off and the cherry-picked commits.

Compare release-4.20...main.
Compare main...release-4.20.

This will make the go.mod and go.sum files in 4.20 to be identical with 4.21 files for the moment.

The 4.21 PR was included in the 4.21.0-0.nightly-2025-10-12-115019 release. Blocking jobs are passing. Relevant informing jobs look good.

JianLi-RH and others added 3 commits October 13, 2025 16:05
This is needed as the CRDs of the ClusterVersionOperator objects are being imported
from the github.com/openshift/api module. To bring a new TechPreview CRD of the
ClusterVersionOperator object, the module must be upgraded.

Steps:

```console
$ go get github.com/openshift/api
$ go mod tidy
$ go mod vendor
```

(cherry picked from commit 9a82fb3)
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 13, 2025
@DavidHurta
Copy link
Contributor Author

/jira cherrypick OCPBUGS-61872

@openshift-ci-robot
Copy link
Contributor

@DavidHurta: Jira Issue OCPBUGS-61872 has been cloned as Jira Issue OCPBUGS-63001. Will retitle bug to link to clone.
/retitle OCPBUGS-63001: Add clusterversionoperator manifests techpreview 4 20

In response to this:

/jira cherrypick OCPBUGS-61872

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot changed the title Add clusterversionoperator manifests techpreview 4 20 OCPBUGS-63001: Add clusterversionoperator manifests techpreview 4 20 Oct 13, 2025
@openshift-ci-robot openshift-ci-robot added jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. labels Oct 13, 2025
@openshift-ci-robot
Copy link
Contributor

@DavidHurta: This pull request references Jira Issue OCPBUGS-63001, which is invalid:

  • release note text must be set and not match the template OR release note type must be set to "Release Note Not Required". For more information you can reference the OpenShift Bug Process.

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:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/invalid-bug Indicates that a referenced Jira bug is invalid for the branch this PR is targeting. label Oct 13, 2025
@DavidHurta
Copy link
Contributor Author

I am cherry-picking the commits from main.

No other changes regarding the imported modules were done between the branch cut-off and the cherry-picked commits.

Compare release-4.20...main.
Compare main...release-4.20.

@DavidHurta
Copy link
Contributor Author

The lint job is being addressed in openshift/release#70229.

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 13, 2025

@DavidHurta: The following test failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/okd-scos-e2e-aws-ovn 365324b link false /test okd-scos-e2e-aws-ovn

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-sigs/prow repository. I understand the commands that are listed here.

@JianLi-RH
Copy link
Contributor

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Oct 14, 2025
@DavidHurta DavidHurta changed the title OCPBUGS-63001: Add clusterversionoperator manifests techpreview 4 20 OCPBUGS-63001: Add ClusterVersionOperator manifests to TechPreviewNoUpgrade clusters in 4.20 Oct 14, 2025
@DavidHurta
Copy link
Contributor Author

/jira refresh

@openshift-ci-robot 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 14, 2025
@openshift-ci-robot
Copy link
Contributor

@DavidHurta: This pull request references Jira Issue OCPBUGS-63001, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug
  • bug is open, matching expected state (open)
  • bug target version (4.20.0) matches configured target version for branch (4.20.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note text is set and does not match the template
  • dependent bug Jira Issue OCPBUGS-61872 is in the state Verified, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-61872 targets the "4.21.0" version, which is one of the valid target versions: 4.21.0
  • bug has dependents

No GitHub users were found matching the public email listed for the QA contact in Jira ([email protected]), skipping review request.

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 openshift-eng/jira-lifecycle-plugin repository.

Copy link
Member

@wking wking left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

This doesn't need to land in 4.20 for GA, so I'll leave backport-risk-assessed off for now.

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 14, 2025
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Oct 14, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: DavidHurta, wking

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

@DavidHurta
Copy link
Contributor Author

/verified by @JianLi-RH

Verification signaled in this comment, although an older label was used.

Evidence of the verification is located in a respective Jira card.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Oct 21, 2025
@openshift-ci-robot
Copy link
Contributor

@DavidHurta: This PR has been marked as verified by @JianLi-RH.

In response to this:

/verified by @JianLi-RH

Verification signaled in this comment, although an older label was used.

Evidence of the verification is located in a respective Jira card.

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 openshift-eng/jira-lifecycle-plugin repository.

@DavidHurta
Copy link
Contributor Author

This doesn't need to land in 4.20 for GA, so I'll leave backport-risk-assessed off for now.

@wking, the 4.20 has GAed and the staff-eng-approved label is no longer required. Are we ready? 👀

@wking
Copy link
Member

wking commented Oct 24, 2025

4.20 is GA.

/label backport-risk-assessed

@openshift-ci openshift-ci bot added the backport-risk-assessed Indicates a PR to a release branch has been evaluated and considered safe to accept. label Oct 24, 2025
@openshift-merge-bot openshift-merge-bot bot merged commit 77782f1 into openshift:release-4.20 Oct 24, 2025
16 of 17 checks passed
@openshift-ci-robot
Copy link
Contributor

@DavidHurta: Jira Issue Verification Checks: Jira Issue OCPBUGS-63001
✔️ This pull request was pre-merge verified.
✔️ All associated pull requests have merged.
✔️ All associated, merged pull requests were pre-merge verified.

Jira Issue OCPBUGS-63001 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

In response to this:

Manual cherry-picking of commits to bring the #1232 into 4.20.

I am cherry-picking the commits from main.

No other changes regarding imported modules were done between the branch cut-off and the cherry-picked commits.

Compare release-4.20...main.
Compare main...release-4.20.

This will make the go.mod and go.sum files in 4.20 to be identical with 4.21 files for the moment.

The 4.21 PR was included in the 4.21.0-0.nightly-2025-10-12-115019 release. Blocking jobs are passing. Relevant informing jobs look good.

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-robot
Copy link
Contributor

Fix included in accepted release 4.20.0-0.nightly-2025-10-25-003142

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. jira/severity-moderate Referenced Jira bug's severity is moderate for the branch this PR is targeting. 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. qe-approved Signifies that QE has signed off on this PR verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants