Skip to content

[release-controller] Adding OKD version 5 support#79604

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
bradmwilliams:okd-release-5
May 21, 2026
Merged

[release-controller] Adding OKD version 5 support#79604
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
bradmwilliams:okd-release-5

Conversation

@bradmwilliams
Copy link
Copy Markdown
Contributor

@bradmwilliams bradmwilliams commented May 21, 2026

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED

Summary by CodeRabbit

This PR adds OpenShift OKD version 5 support to the release controller infrastructure by introducing new release configuration for OKD SCOS 5.

What's changing:

The PR adds release tracking and verification configuration for two new OKD 5 release streams:

  1. OKD SCOS 5.y-stable - A new stable release stream with upgrade and upgrade-minor verification jobs configured to run against AWS environments. Both verification paths are set to retry up to 2 times on failure, and the upgrade-minor flow specifies upgrading from the previous minor version.

  2. OKD SCOS 5.y-next - A corresponding next/development release stream with similar upgrade verification configuration. This stream is set to expire after 72 hours.

Both configurations define explicit CLI image overrides and constraints on unready releases and minimum creation intervals.

Infrastructure updates:

The hack/annotate.sh annotation script is updated to process these new OKD 5 release streams, ensuring they're properly annotated as part of the release workflow.

These changes enable the OpenShift release controller to manage and track OKD 5 releases, handling both stable releases and pre-release testing streams with automated verification jobs.

rh-pre-commit.version: 2.4.0
rh-pre-commit.check-secrets: ENABLED
@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented May 21, 2026

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: 5c2d26d8-c268-40b9-9e7b-f04f5ededd60

📥 Commits

Reviewing files that changed from the base of the PR and between f8d5c5b and acfab0b.

📒 Files selected for processing (3)
  • core-services/release-controller/_releases/release-okd-scos-5.y-next.json
  • core-services/release-controller/_releases/release-okd-scos-5.y-stable.json
  • hack/annotate.sh

Walkthrough

This PR adds two new OKD SCOS release configurations (5-scos-next and 5-scos-stable) with upgrade and upgrade-minor verification settings, and registers them in the release-controller annotation script. Both configurations share a common Prow job for testing and include retry limits.

Changes

OKD 5.y SCOS Release Setup

Layer / File(s) Summary
Release configuration definitions
core-services/release-controller/_releases/release-okd-scos-5.y-next.json, core-services/release-controller/_releases/release-okd-scos-5.y-stable.json
Two new release configurations define 5-scos-next and 5-scos-stable with CLI image overrides, 72h expiry, creation/unready release constraints, and verification upgrade paths each pointing to release-openshift-okd-scos-installer-e2e-aws-upgrade-from-scos-stable with maxRetries: 2. The 5-scos-stable configuration includes upgradeFrom: "PreviousMinor" for minor-version upgrades.
Release annotation script integration
hack/annotate.sh
Registers the two new configurations in the release annotation workflow under a new "OKD 5.y-stable release streams" section, annotating release-5-scos and release-5-scos-next on the origin namespace.

🎯 1 (Trivial) | ⏱️ ~3 minutes


Suggested labels: lgtm, rehearsals-ack

Suggested reviewers:

  • petr-muller
  • joepvd
  • deepsm007
🚥 Pre-merge checks | ✅ 12
✅ Passed checks (12 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately reflects the main change: adding OKD version 5 support by introducing new release configuration files and annotation steps for OKD 5.y-stable and 5.y-next release streams.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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 PR adds only JSON configuration files and a shell script; no Ginkgo test files are modified, so the check for stable test names is not applicable.
Test Structure And Quality ✅ Passed No Ginkgo test files present in PR. This check applies only to test code; PR contains only JSON configs and bash script changes.
Microshift Test Compatibility ✅ Passed PR adds only JSON configuration files and bash script updates; no Ginkgo e2e tests are added, so MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed PR adds release configuration files and bash scripts for OKD 5 support, not Ginkgo e2e tests. SNO test compatibility check is not applicable.
Topology-Aware Scheduling Compatibility ✅ Passed PR contains only release-controller configuration files and build automation scripts; no deployment manifests, operator code, or controller code with scheduling constraints.
Ote Binary Stdout Contract ✅ Passed PR adds only JSON configuration files and bash utility script—no OTE binary or test setup code that could violate stdout contract.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR adds JSON configuration files and updates a shell script; it does not add any Ginkgo e2e tests. The custom check only applies when tests with It(), Describe(), Context(), etc. are added.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

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

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

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label May 21, 2026
@openshift-merge-bot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@bradmwilliams: no rehearsable tests are affected by this change

Note: If this PR includes changes to step registry files (ci-operator/step-registry/) and you expected jobs to be found, try rebasing your PR onto the base branch. This helps pj-rehearse accurately detect changes when the base branch has moved forward.

@openshift-ci openshift-ci Bot requested review from danilo-gemoli and deads2k May 21, 2026 13:04
@bradmwilliams
Copy link
Copy Markdown
Contributor Author

/hold
Waiting for the OKD folks to confirm

@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 May 21, 2026
@bradmwilliams
Copy link
Copy Markdown
Contributor Author

/cc @jupierce

@openshift-ci openshift-ci Bot requested a review from jupierce May 21, 2026 13:07
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

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

@jupierce
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added lgtm Indicates that a PR is ready to be merged. approved Indicates a PR has been approved by an approver from all required OWNERS files. labels May 21, 2026
@Prashanth684
Copy link
Copy Markdown
Contributor

/lgtm
/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 May 21, 2026
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 21, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: bradmwilliams, jupierce, Prashanth684

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-merge-bot openshift-merge-bot Bot merged commit 3165747 into openshift:main May 21, 2026
8 checks passed
@bradmwilliams bradmwilliams deleted the okd-release-5 branch May 21, 2026 17:20
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. lgtm Indicates that a PR is ready to be merged. rehearsals-ack Signifies that rehearsal jobs have been acknowledged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants