Skip to content

OTA-1861: data/bootstrap/files/usr/local/bin/bootkube: Pass CVO render --cluster-version-manifest-path#10295

Merged
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
wking:cluster-version-overrides-on-render
Feb 26, 2026
Merged

OTA-1861: data/bootstrap/files/usr/local/bin/bootkube: Pass CVO render --cluster-version-manifest-path#10295
openshift-merge-bot[bot] merged 1 commit intoopenshift:mainfrom
wking:cluster-version-overrides-on-render

Conversation

@wking
Copy link
Member

@wking wking commented Feb 9, 2026

Like 9bbe172 (#8813), but for the ClusterVersion manifest laid down by pkg/asset/ignition/bootstrap/cvoignore.go. To populate the new flag provided by openshift/cluster-version-operator#1315.

…r-version-manifest-path

Like 9bbe172 (data/bootstrap/files/usr/local/bin/bootkube: Pass CVO
render --feature-gate-manifest-path, 2024-08-07, openshift#8813), but for the
ClusterVersion manifest laid down by
pkg/asset/ignition/bootstrap/cvoignore.go.  To populate the new flag
provided by [1].

[1]: openshift/cluster-version-operator#1315
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Feb 9, 2026
@openshift-ci-robot
Copy link
Contributor

openshift-ci-robot commented Feb 9, 2026

@wking: This pull request references OTA-1861 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.22.0" version, but no target version was set.

Details

In response to this:

Like 9bbe172 (#8813), but for the ClusterVersion manifest laid down by pkg/asset/ignition/bootstrap/cvoignore.go. To populate the new flag provided by openshift/cluster-version-operator#1315.

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.

@wking
Copy link
Member Author

wking commented Feb 9, 2026

/hold for openshift/cluster-version-operator#1315 to merge, because we can't set the flag until it exists (in both nightly and CI releases)

@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 Feb 9, 2026
@wking
Copy link
Member Author

wking commented Feb 19, 2026

openshift/cluster-version-operator#1315 merged. It isn't yet in 4.22 nightlies, so I'm not lifting the hold yet. But it should be in CI, so:

/retest-required

@wking
Copy link
Member Author

wking commented Feb 23, 2026

We're in nightlies now:

$ oc adm release info --commits registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-02-21-040517 | grep cluster-version-operator
  cluster-version-operator                       https://github.com/openshift/cluster-version-operator                       8e4d0468c97a3811517f0ecd609876553ac1a481
$ oc adm release info --commits quay.io/openshift-release-dev/ocp-release-nightly@sha256:6c6b5f82f99a146908c73a9b394238dc7a54033a1d9be632af6264c1c08039d1 | grep '^Name:\|cluster-version-operator'
Name:           4.22.0-0.nightly-multi-2026-02-23-040809
  cluster-version-operator                       https://github.com/openshift/cluster-version-operator                       8e4d0468c97a3811517f0ecd609876553ac1a481
$ git log --oneline origin/release-4.22 | grep -n '8e4d046\|cluster-version-manifest-path'
1:8e4d0468c Merge pull request #1315 from wking/cluster-version-overrides-on-render
17:a837056f8 cmd/cluster-version-operator/render: Add --cluster-version-manifest-path option

/hold cancel

@openshift-ci openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 23, 2026
@QiWang19
Copy link
Member

/verified by Cluster-bot with openshift/cluster-version-operator#1315

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Feb 23, 2026
@openshift-ci-robot
Copy link
Contributor

@QiWang19: This PR has been marked as verified by Cluster-bot with https://github.com/openshift/cluster-version-operator/pull/1315.

Details

In response to this:

/verified by Cluster-bot with openshift/cluster-version-operator#1315

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

@QiWang19 QiWang19 left a comment

Choose a reason for hiding this comment

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

/lgtm
/label acknowledge-critical-fixes-only

@openshift-ci openshift-ci bot added the acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. label Feb 23, 2026
@QiWang19
Copy link
Member

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2026
@QiWang19
Copy link
Member

/assign @patrickdillon

@patrickdillon
Copy link
Contributor

/approve

@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 25, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: patrickdillon

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 Feb 25, 2026
@openshift-ci
Copy link
Contributor

openshift-ci bot commented Feb 26, 2026

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

@openshift-merge-bot openshift-merge-bot bot merged commit 1002fca into openshift:main Feb 26, 2026
14 checks passed
@wking wking deleted the cluster-version-overrides-on-render branch March 2, 2026 23:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

acknowledge-critical-fixes-only Indicates if the issuer of the label is OK with the policy. approved Indicates a PR has been approved by an approver from all required OWNERS files. 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. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants