Skip to content

CNTRLPLANE-4038: feat(supportedversion): bump latest supported OCP version to 5.1 - #9288

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
Nirshal:CNTRLPLANE-4038
Aug 13, 2026
Merged

CNTRLPLANE-4038: feat(supportedversion): bump latest supported OCP version to 5.1#9288
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
Nirshal:CNTRLPLANE-4038

Conversation

@Nirshal

@Nirshal Nirshal commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

What this PR does / why we need it:
Bumps LatestSupportedVersion from 5.0 to 5.1 to unblock 5.1 nightly payload acceptance and the Azure AKS conformance periodic job (e2e-azure-aks-ovn-conformance) on the release-5.1 branch.

The HyperShift operator's supported-versions ConfigMap only listed up to 5.0, causing all 5.1 nightly payload runs to fail because NodePool rejects the 5.1 payload as unsupported.

Changes:

  • Bump LatestSupportedVersion to 5.1.0
  • Add OCP 4.24 (5.1 normalized) to Kubernetes 1.37 version mapping
  • Add Version51 e2e constant with compile-time check
  • Update test expectations for the new supported versions list

Which issue(s) this PR fixes:
Fixes CNTRLPLANE-4038

Previous version bump for reference: CNTRLPLANE-1370 / PR #6739

Slack thread flagging the issue: link

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

Summary by CodeRabbit

  • New Features

    • Added support for OpenShift 5.1.0.
    • Added Kubernetes 1.37 mapping for OpenShift 5.1 and retained Kubernetes 1.36 mapping for OpenShift 5.0.
    • Added compatibility with determining the previous supported OpenShift minor version.
  • Bug Fixes

    • Updated version validation and compatibility lookups to correctly recognize distinct OpenShift 5.x releases.
    • Updated test coverage for OpenShift 5.1.0 and its Kubernetes version mapping.

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: LGTM mode

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 12, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 12, 2026

Copy link
Copy Markdown

@Nirshal: This pull request references CNTRLPLANE-4038 which is a valid jira issue.

Details

In response to this:

What this PR does / why we need it:
Bumps LatestSupportedVersion from 5.0 to 5.1 to unblock 5.1 nightly payload acceptance and the Azure AKS conformance periodic job (e2e-azure-aks-ovn-conformance) on the release-5.1 branch.

The HyperShift operator's supported-versions ConfigMap only listed up to 5.0, causing all 5.1 nightly payload runs to fail because NodePool rejects the 5.1 payload as unsupported.

Changes:

  • Bump LatestSupportedVersion to 5.1.0
  • Add OCP 4.24 (5.1 normalized) to Kubernetes 1.37 version mapping
  • Add Version51 e2e constant with compile-time check
  • Update test expectations for the new supported versions list

Which issue(s) this PR fixes:
Fixes CNTRLPLANE-4038

Previous version bump for reference: CNTRLPLANE-1370 / PR #6739

Slack thread flagging the issue: link

Checklist

  • Subject and description added to both, commit and PR.
  • Relevant issues have been referenced.
  • This change includes docs.
  • This change includes unit tests.

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 added area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/testing Indicates the PR includes changes for e2e testing and removed do-not-merge/needs-area labels Aug 12, 2026
@coderabbitai

coderabbitai Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 0aa1aeb8-a0b7-4da8-8893-d082a851be3c

📥 Commits

Reviewing files that changed from the base of the PR and between a309ad9 and 5836d27.

📒 Files selected for processing (1)
  • support/supportedversion/version_test.go
🚧 Files skipped from review as they are similar to previous changes (1)
  • support/supportedversion/version_test.go

📝 Walkthrough

Walkthrough

The latest supported OpenShift version changes from 5.0.0 to 5.1.0. Kubernetes mappings now include OpenShift 5.0 to Kubernetes 1.36 and OpenShift 5.1 to Kubernetes 1.37. Direct major/minor lookups preserve separate OpenShift 5.x mappings. Tests and E2E utilities include OpenShift 5.1.0.

Suggested reviewers: ironcladlou

🚥 Pre-merge checks | ✅ 11
✅ Passed checks (11 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the main change: updating the latest supported OCP version to 5.1.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed The diff adds only literal, static subtest names; no Ginkgo title calls or runtime-derived values appear, and Version51 is not used in a title.
Test Structure And Quality ✅ Passed The PR adds table-driven Go unit cases, not Ginkgo It blocks. The added cases create no cluster resources, perform no waits, and add no new assertion calls requiring messages.
Topology-Aware Scheduling Compatibility ✅ Passed The diff changes only version mappings and tests in three Go files; it adds no manifests, controllers, workloads, or scheduling constraints.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR changes only version logic, unit-test expectations, and an e2e version constant; it adds no Ginkgo e2e test nodes or new IPv4/external-connectivity test behavior.
No-Weak-Crypto ✅ Passed The diff only changes version mappings, tests, and Version51; scans found no MD5, SHA1, DES, RC4, Blowfish, ECB, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed The PR changes only three Go files; the committed diff adds no privileged, hostPID, hostNetwork, hostIPC, SYS_ADMIN, root, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs ✅ Passed The commit changes version values, mappings, tests, and an e2e constant. The exact diff adds no logging calls or sensitive data; existing formatted strings are unchanged.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@coderabbitai coderabbitai Bot left a comment

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.

🧹 Nitpick comments (1)
test/e2e/util/version.go (1)

38-38: 📐 Maintainability & Code Quality | 🔵 Trivial | ⚡ Quick win

Remove the redundant init() block.

semver.MustParse validates each package-level version during package initialization. The _ = Version51 assignments do not provide a compile-time check. Remove these assignments and the init() block.

🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@test/e2e/util/version.go` at line 38, Remove the redundant init() block and
its _ = Version51-style assignments in the version definitions, leaving
semver.MustParse package-level initialization as the sole validation mechanism.

Source: Coding guidelines

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Nitpick comments:
In `@test/e2e/util/version.go`:
- Line 38: Remove the redundant init() block and its _ = Version51-style
assignments in the version definitions, leaving semver.MustParse package-level
initialization as the sole validation mechanism.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Enterprise

Run ID: 63c58805-b31f-4379-96f3-2bb86517e56f

📥 Commits

Reviewing files that changed from the base of the PR and between 16f91de and 2d0989f.

📒 Files selected for processing (3)
  • support/supportedversion/version.go
  • support/supportedversion/version_test.go
  • test/e2e/util/version.go

@Nirshal

Nirshal commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

Remove the redundant init() block.

This init() block with _ = VersionXX assignments is a pre-existing pattern in the file - we just followed it by adding _ = Version51. Removing the entire block would be a refactor outside the scope of this version bump PR. Happy to clean it up in a follow-up if desired.

@codecov

codecov Bot commented Aug 12, 2026

Copy link
Copy Markdown

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 45.69%. Comparing base (7927588) to head (072f8e0).
⚠️ Report is 17 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #9288      +/-   ##
==========================================
+ Coverage   45.68%   45.69%   +0.01%     
==========================================
  Files         781      781              
  Lines       97730    97732       +2     
==========================================
+ Hits        44646    44659      +13     
+ Misses      50015    50005      -10     
+ Partials     3069     3068       -1     
Files with missing lines Coverage Δ
support/supportedversion/version.go 69.91% <100.00%> (+3.34%) ⬆️
Flag Coverage Δ
cmd-support 38.83% <100.00%> (+0.03%) ⬆️
cpo-hostedcontrolplane 47.83% <ø> (ø)
cpo-other 45.93% <ø> (ø)
hypershift-operator 56.97% <ø> (ø)
other 34.38% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Comment thread support/supportedversion/version.go Outdated
"4.21.0": semver.MustParse("1.34.0"),
"4.22.0": semver.MustParse("1.35.0"),
"4.23.0": semver.MustParse("1.36.0"),
"4.24.0": semver.MustParse("1.37.0"),

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.

This is wrong.

@Nirshal

Nirshal commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

/hold

@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 Aug 12, 2026
@Nirshal

Nirshal commented Aug 12, 2026

Copy link
Copy Markdown
Contributor Author

/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 Aug 12, 2026
@bryan-cox

Copy link
Copy Markdown
Member

/approve

@openshift-ci

openshift-ci Bot commented Aug 12, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bryan-cox, Nirshal

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 Aug 12, 2026
Update LatestSupportedVersion from 5.0 to 5.1 to unblock 5.1 nightly
payload acceptance and the Azure AKS conformance periodic job on the
release-5.1 branch.

- Bump LatestSupportedVersion to 5.1.0
- Add 5.0.0 and 5.1.0 entries to ocpVersionToKubeVersion map with
  direct lookup (5.1+ are distinct versions with no 4.x equivalent)
- Remove normalizeToV4 from GetKubeVersionForSupportedVersion since
  the map now uses real version keys for both 4.x and 5.x series
- Add Version51 e2e constant with compile-time check
- Update test expectations for the new supported versions list

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
@ironcladlou

Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 12, 2026
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Scheduling tests matching the pipeline_run_if_changed or not excluded by pipeline_skip_if_only_changed parameters:
/test e2e-aks-4-22
/test e2e-aws-4-22
/test e2e-aks
/test e2e-aws
/test e2e-aws-upgrade-hypershift-operator
/test e2e-kubevirt-aws-ovn-reduced
/test e2e-v2-aws
/test e2e-v2-azure-self-managed
/test e2e-v2-gke

@cwbotbot

cwbotbot commented Aug 12, 2026

Copy link
Copy Markdown

Test Results

e2e-aws

e2e-aks

@ironcladlou

Copy link
Copy Markdown
Contributor

/retest

@neisw

neisw commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

/retest-required

@redhat-chai-bot

Copy link
Copy Markdown
Contributor

/retest


AI-generated. Review for accuracy.

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

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

@bryan-cox

Copy link
Copy Markdown
Member

/override "Red Hat Konflux / hypershift-operator-enterprise-contract / hypershift-operator-main"
/override "Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main"

We know these are failing outside this PR. Someone is working on a fix for them. No need to hold this PR for them.

@bryan-cox

Copy link
Copy Markdown
Member

/verified by e2e & UTs

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown
Contributor

@bryan-cox: Overrode contexts on behalf of bryan-cox: Red Hat Konflux / hypershift-operator-enterprise-contract / hypershift-operator-main, Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main

Details

In response to this:

/override "Red Hat Konflux / hypershift-operator-enterprise-contract / hypershift-operator-main"
/override "Red Hat Konflux / hypershift-operator-main-enterprise-contract / hypershift-operator-main"

We know these are failing outside this PR. Someone is working on a fix for them. No need to hold this PR for them.

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.

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

Copy link
Copy Markdown

@bryan-cox: This PR has been marked as verified by e2e & UTs.

Details

In response to this:

/verified by e2e & UTs

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-bot
openshift-merge-bot Bot merged commit aaaf8af into openshift:main Aug 13, 2026
45 of 47 checks passed
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. area/control-plane-operator Indicates the PR includes changes for the control plane operator - in an OCP release area/hypershift-operator Indicates the PR includes changes for the hypershift operator and API - outside an OCP release area/testing Indicates the PR includes changes for e2e testing 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.

7 participants