Skip to content

[release-4.22] OCPBUGS-92056: Stop setting DevPreviewNoUpgrade for TNF clusters#10516

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-10507-to-release-4.22
Jun 24, 2026
Merged

[release-4.22] OCPBUGS-92056: Stop setting DevPreviewNoUpgrade for TNF clusters#10516
openshift-merge-bot[bot] merged 3 commits into
openshift:release-4.22from
openshift-cherrypick-robot:cherry-pick-10507-to-release-4.22

Conversation

@openshift-cherrypick-robot

Copy link
Copy Markdown

This is an automated cherry-pick of #10507

/assign fonta-rh

fonta-rh added 3 commits June 24, 2026 20:57
TNF clusters deployed via Agent-Based Install were unconditionally
marked with DevPreviewNoUpgrade FeatureSet, blocking upgrades even
on 4.22 where TNF is GA. Mirror the TNA pattern: set
DevPreviewNoUpgrade only for 4.20 (minimum version), omit it for
4.22+ so the Default FeatureSet applies. Update getSupportLevel()
to return DevPreview for 4.20 and Supported for later versions.

Assisted-by: Claude Code <noreply@anthropic.com>
TNF is TechPreview in 4.20-4.21 and GA from 4.22, not DevPreview as
previously set. Use BaseVersionGreaterOrEqual("4.22") to cover both
TechPreview versions instead of BaseVersionEqual(minVersion).

Assisted-by: Claude Code <noreply@anthropic.com>
Assisted-by: Claude Code <noreply@anthropic.com>
@coderabbitai

coderabbitai Bot commented Jun 24, 2026

Copy link
Copy Markdown

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 5536c4ed-e5d7-4c77-baf7-7b0f6618f511

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Jun 24, 2026
@openshift-ci openshift-ci Bot requested review from jhernand and romfreiman June 24, 2026 20:57
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue OCPBUGS-91974 has been cloned as Jira Issue OCPBUGS-92056. Will retitle bug to link to clone.
/retitle [release-4.22] OCPBUGS-92056: Stop setting DevPreviewNoUpgrade for TNF clusters

Details

In response to this:

This is an automated cherry-pick of #10507

/assign fonta-rh

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 [release-4.22] OCPBUGS-91974: Stop setting DevPreviewNoUpgrade for TNF clusters [release-4.22] OCPBUGS-92056: Stop setting DevPreviewNoUpgrade for TNF clusters Jun 24, 2026
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: This pull request references Jira Issue OCPBUGS-92056, 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.

Details

In response to this:

This is an automated cherry-pick of #10507

/assign fonta-rh

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 Jun 24, 2026
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 24, 2026
@openshift-ci

openshift-ci Bot commented Jun 24, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: carbonin, openshift-cherrypick-robot

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 Jun 24, 2026
@fonta-rh

Copy link
Copy Markdown
Contributor

/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 Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@fonta-rh: This pull request references Jira Issue OCPBUGS-92056, 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.22.0) matches configured target version for branch (4.22.0)
  • bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
  • release note type set to "Release Note Not Required"
  • dependent bug Jira Issue OCPBUGS-91974 is in the state MODIFIED, which is one of the valid states (MODIFIED, ON_QA, VERIFIED)
  • dependent Jira Issue OCPBUGS-91974 targets the "5.0.0" version, which is one of the valid target versions: 5.0.0
  • bug has dependents
Details

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.

@fonta-rh

Copy link
Copy Markdown
Contributor

/verified by fonta-rh
on a self-deployed cluster

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 24, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@fonta-rh: This PR has been marked as verified by fonta-rh.

Details

In response to this:

/verified by fonta-rh
on a self-deployed cluster

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 commented Jun 24, 2026

Copy link
Copy Markdown

@openshift-cherrypick-robot: 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/e2e-agent-compact-ipv4-iso-no-registry 29eba16 link false /test e2e-agent-compact-ipv4-iso-no-registry

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.

@jerpeter1

Copy link
Copy Markdown
Member

/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 Jun 24, 2026
@openshift-merge-bot openshift-merge-bot Bot merged commit 1090e09 into openshift:release-4.22 Jun 24, 2026
6 of 7 checks passed
@openshift-ci-robot

Copy link
Copy Markdown

@openshift-cherrypick-robot: Jira Issue Verification Checks: Jira Issue OCPBUGS-92056
✔️ 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-92056 has been moved to the MODIFIED state and will move to the VERIFIED state when the change is available in an accepted nightly payload. 🕓

Details

In response to this:

This is an automated cherry-pick of #10507

/assign fonta-rh

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.

return err
}
if !isGA {
cfg.FeatureSet = configv1.TechPreviewNoUpgrade

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Just FYI this has the (perhaps unexpected) side effect of turning on all Tech Preview features.
The alternative is to use CustomNoUpgrade and just enable the specific feature you need.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Ahh, I copied this over from Two Nodes with Arbiter and didn't see the unintended effect.
I think it's not worth updating because this will only affect 4.21 and lower clusters, which no one is really going to install ever. Thanks for the warning though, I'll keep it in mind for the future

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Yeah, there is no point in changing this in the release-4.22 branch as by definition it is only used to install 4.22 🙂

But it is worth changing on master because that will affect clusters installed with the Assisted SaaS or MCE.

@openshift-merge-robot

Copy link
Copy Markdown

Fix included in release 4.22.0-0.nightly-2026-06-25-210812

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/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/M Denotes a PR that changes 30-99 lines, ignoring generated files. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants