Skip to content

NO-ISSUE: [master] Bump OCP versions: 4.20, 4.18, 4.22#10139

Closed
danmanor wants to merge 1 commit intoopenshift:masterfrom
danmanor:bump/ocp-releases-06bdd8ee-6b4a-4c39-8d68-ad85f76c4337
Closed

NO-ISSUE: [master] Bump OCP versions: 4.20, 4.18, 4.22#10139
danmanor wants to merge 1 commit intoopenshift:masterfrom
danmanor:bump/ocp-releases-06bdd8ee-6b4a-4c39-8d68-ad85f76c4337

Conversation

@danmanor
Copy link
Copy Markdown
Contributor

@danmanor danmanor commented Apr 14, 2026

OpenShift updates: 4.20.17-multi -> 4.20.18-multi, 4.18.36 -> 4.18.37, 4.18.36-multi -> 4.18.37-multi, 4.20.17 -> 4.20.18, 4.22.0-ec.4-multi -> 4.22.0-ec.5-multi, 4.22.0-ec.4 -> 4.22.0-ec.5
RHCOS updates: 4.22.0-ec.3 -> 4.22.0-ec.5

/test edge-e2e-metal-assisted-4-20 edge-e2e-metal-assisted-4-18 edge-e2e-metal-assisted-4-22
/cc @rccrdpccl @gamli75

Summary by CodeRabbit

  • New Features

    • Extended OpenShift 4.11 support to additional CPU architectures (s390x and ppc64le).
  • Updates

    • Updated OpenShift 4.22 OS image references to latest pre-release build.
    • Updated OpenShift release image versions (4.18, 4.20, and 4.22).

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Apr 14, 2026
@openshift-ci-robot
Copy link
Copy Markdown

@danmanor: This pull request explicitly references no jira issue.

Details

In response to this:

OpenShift updates: 4.20.17-multi -> 4.20.18-multi, 4.18.36 -> 4.18.37, 4.18.36-multi -> 4.18.37-multi, 4.20.17 -> 4.20.18, 4.22.0-ec.4-multi -> 4.22.0-ec.5-multi, 4.22.0-ec.4 -> 4.22.0-ec.5
RHCOS updates: 4.22.0-ec.3 -> 4.22.0-ec.5

/test edge-e2e-metal-assisted-4-20 edge-e2e-metal-assisted-4-18 edge-e2e-metal-assisted-4-22
/cc @rccrdpccl @gamli75

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 requested review from gamli75 and rccrdpccl April 14, 2026 04:27
@coderabbitai
Copy link
Copy Markdown

coderabbitai bot commented Apr 14, 2026

Walkthrough

Updates RHCOS pre-release ISO URLs from 4.22.0-ec.3 to 4.22.0-ec.5 and bumps OpenShift release image versions (4.18→4.18.37, 4.20→4.20.18) across multiple configuration and data files.

Changes

Cohort / File(s) Summary
Core Data Files
data/default_os_images.json, data/default_release_images.json
Updated RHCOS 4.22 pre-release ISO URLs (ec.3→ec.5) and bumped release image versions (4.18.36→4.18.37, 4.20.17→4.20.18, 4.22.0-ec.4→4.22.0-ec.5).
Manager & Sample Manifests
config/manager/manager.yaml, config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml
Updated embedded OS_IMAGES and osImages JSON entries; added architecture coverage (s390x, ppc64le) for 4.11; updated 4.22 pre-release ISO URLs (ec.3→ec.5) across architectures.
Operator Deployment Manifest
deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml
Updated SERVICE_OS_IMAGES environment variable and osImages field with 4.22 pre-release ISO URLs (ec.3→ec.5) for x86_64, ppc64le, and s390x.
Deployment Configuration Files
deploy/podman/configmap.yml, openshift/template.yaml
Updated OS_IMAGES and RELEASE_IMAGES ConfigMap and template parameter JSON entries; refreshed 4.22 pre-release ISO URLs (ec.3→ec.5) and release image versions (4.18.36→4.18.37, 4.20.17→4.20.18, 4.22.0-ec.4→4.22.0-ec.5).

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes

🚥 Pre-merge checks | ✅ 9 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Description check ⚠️ Warning The description is incomplete; it lacks required template sections like issue type checkboxes, environment impact, testing method, and the checklist items. Fill out the required PR description template sections including issue type, environment impact, testing confirmation, and checklist items before merging.
✅ Passed checks (9 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly and concisely summarizes the main change: bumping OpenShift versions 4.18, 4.20, and 4.22 across multiple files.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Stable And Deterministic Test Names ✅ Passed PR modifies only configuration and data files; no Ginkgo test files are changed.
Test Structure And Quality ✅ Passed The custom check for Test Structure and Quality reviews Ginkgo test code quality, but this PR contains no test file modifications.
Microshift Test Compatibility ✅ Passed PR does not add new Ginkgo e2e tests. Grep matches are false positives from configuration and data files. Changes limited to OpenShift release version updates.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No Ginkgo e2e test files have been added to this PR. All changes are configuration and data files (YAML, JSON, templates).
Topology-Aware Scheduling Compatibility ✅ Passed This pull request exclusively updates OpenShift and RHCOS version numbers and ISO URLs in configuration files with no scheduling constraints introduced or modified.
Ote Binary Stdout Contract ✅ Passed Pull request contains only configuration and data file updates with no executable code modifications, preventing OTE Binary Stdout Contract violations.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR modifies configuration and data files only, with no new Ginkgo e2e tests 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-ci openshift-ci bot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Apr 14, 2026
@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 14, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: danmanor

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 Apr 14, 2026
Copy link
Copy Markdown

@coderabbitai coderabbitai bot left a comment

Choose a reason for hiding this comment

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

Caution

Some comments are outside the diff and can’t be posted inline due to platform limitations.

⚠️ Outside diff range comments (1)
data/default_os_images.json (1)

237-257: ⚠️ Potential issue | 🟠 Major

Update the 4.22 arm64 RHCOS ISO to ec.5 too.

Line 245 still points at 4.22.0-ec.3, leaving the 4.22 OS-image catalog inconsistent across architectures. This PR already updates the 4.22 arm64 release image to ec.5 (visible in data/default_release_images.json), confirming ec.5 is the correct version for arm64.

After fixing this block, re-sync the duplicated OS-image arrays in:

  • config/manager/manager.yaml
  • deploy/podman/configmap.yml
  • openshift/template.yaml
  • config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml
  • deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml
Suggested patch
     {
         "openshift_version": "4.22",
         "cpu_architecture": "arm64",
-        "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.22.0-ec.3/rhcos-4.22.0-ec.3-aarch64-live-iso.aarch64.iso",
+        "url": "https://mirror.openshift.com/pub/openshift-v4/aarch64/dependencies/rhcos/pre-release/4.22.0-ec.5/rhcos-4.22.0-ec.5-aarch64-live-iso.aarch64.iso",
         "version": "9.6.20251023-0"
     },
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed.

In `@data/default_os_images.json` around lines 237 - 257, The arm64 RHCOS entry
for openshift_version "4.22" (the JSON object with "cpu_architecture": "arm64"
whose "url" currently contains "4.22.0-ec.3") must be updated to use the ec.5
ISO URL (change "ec.3" to "ec.5") and keep the "version" value unchanged; after
updating that JSON object, re-sync the duplicated OS-image arrays across the
other manifests so all architectures for 4.22 consistently reference the ec.5
images.
🤖 Prompt for all review comments with AI agents
Verify each finding against the current code and only fix it if needed.

Outside diff comments:
In `@data/default_os_images.json`:
- Around line 237-257: The arm64 RHCOS entry for openshift_version "4.22" (the
JSON object with "cpu_architecture": "arm64" whose "url" currently contains
"4.22.0-ec.3") must be updated to use the ec.5 ISO URL (change "ec.3" to "ec.5")
and keep the "version" value unchanged; after updating that JSON object, re-sync
the duplicated OS-image arrays across the other manifests so all architectures
for 4.22 consistently reference the ec.5 images.

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Pro Plus

Run ID: 7305b62b-afa5-49ec-be4a-efb8a30706c0

📥 Commits

Reviewing files that changed from the base of the PR and between a05062b and 68af87f.

📒 Files selected for processing (7)
  • config/manager/manager.yaml
  • config/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yaml
  • data/default_os_images.json
  • data/default_release_images.json
  • deploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yaml
  • deploy/podman/configmap.yml
  • openshift/template.yaml

@codecov
Copy link
Copy Markdown

codecov bot commented Apr 14, 2026

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 44.29%. Comparing base (a05062b) to head (68af87f).
⚠️ Report is 2 commits behind head on master.

Additional details and impacted files

Impacted file tree graph

@@           Coverage Diff           @@
##           master   #10139   +/-   ##
=======================================
  Coverage   44.29%   44.29%           
=======================================
  Files         415      415           
  Lines       72713    72713           
=======================================
  Hits        32205    32205           
  Misses      37598    37598           
  Partials     2910     2910           
🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@openshift-ci
Copy link
Copy Markdown

openshift-ci bot commented Apr 14, 2026

@danmanor: The following tests 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 68af87f link true /test e2e-agent-compact-ipv4
ci/prow/e2e-agent-compact-ipv4-iso-no-registry 68af87f 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.

@danmanor
Copy link
Copy Markdown
Contributor Author

Closing as duplicate of #10146

@danmanor danmanor closed this Apr 15, 2026
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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants