NO-ISSUE: [master] Bump OCP versions: 4.18, 4.20, 4.22#10128
NO-ISSUE: [master] Bump OCP versions: 4.18, 4.20, 4.22#10128danmanor wants to merge 1 commit intoopenshift:masterfrom
Conversation
openshift-ci-robot
added
the
jira/valid-reference
|
@danmanor: This pull request explicitly references no jira issue. DetailsIn response to this:
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
bot
added
the
size/M
WalkthroughThis pull request updates RHCOS (Red Hat Enterprise Linux CoreOS) OS image references and OpenShift release image versions across configuration, data, and deployment manifest files. Changes include bumping OpenShift 4.18 from 4.18.36 to 4.18.37, 4.20 from 4.20.17 to 4.20.18, updating 4.22 pre-release from ec.4 to ec.5, and adjusting RHCOS pre-release ISO URLs from ec.3 to ec.5. Changes
Estimated code review effort🎯 3 (Moderate) | ⏱️ ~25 minutes ✨ Finishing Touches🧪 Generate unit tests (beta)
Comment |
openshift-ci
bot
added
the
approved
![coderabbitai[bot]](https://avatars.githubusercontent.com/in/347564?s=60&v=4){kind=small}
There was a problem hiding this comment.
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)
239-257:⚠️ Potential issue | 🟠 MajorKeep the 4.22 RHCOS EC aligned across architectures.
x86_64/ppc64le/s390xmoved toec.5, but the adjacentarm64entry is stillec.3. That leaves 4.22 arm64 on a different RHCOS build than the rest of the 4.22 OS-image set and the 4.22 arm64 release-image bump indata/default_release_images.json. The same stale arm64 URL is still mirrored in the sample/operator/template blobs, so the fix needs to be propagated there too.Patch suggestion
{ "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 239 - 257, The arm64 RHCOS entry for openshift_version "4.22" (cpu_architecture "arm64") uses the old ec.3 URL/version; update its "url" and "version" to match the ec.5 build used by x86_64/ppc64le/s390x (replace the ec.3 path segment with ec.5 and bump the version string to the same "9.6.20251023-0"), and then propagate the identical ec.5 arm64 URL change to the corresponding sample/operator/template blobs that still reference the stale arm64 URL so all 4.22 architectures and release-image entries are consistent.
🧹 Nitpick comments (1)
openshift/template.yaml (1)
20-23: Make the image catalogs single-sourced.
OS_IMAGESandRELEASE_IMAGESare being hand-maintained in multiple manifests plusdata/default_os_images.json/data/default_release_images.json. That duplication already made the 4.22 arm64 OS-image drift easy to miss; generating these template values from the default JSON files would reduce recurring version skew.As per coding guidelines, "Focus on major issues impacting performance, readability, maintainability and security. Avoid nitpicks and avoid verbosity."
🤖 Prompt for AI Agents
Verify each finding against the current code and only fix it if needed. In `@openshift/template.yaml` around lines 20 - 23, The template currently hardcodes OS_IMAGES and RELEASE_IMAGES JSON arrays, causing duplication with data/default_os_images.json and data/default_release_images.json; change the template generation so OS_IMAGES and RELEASE_IMAGES are populated from those single-source JSON files instead of being hand-edited: update the template build step (or template renderer) to read data/default_os_images.json and data/default_release_images.json and inject their contents into the template value fields for OS_IMAGES and RELEASE_IMAGES so the manifest no longer contains duplicated, manually maintained arrays.
🤖 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 239-257: The arm64 RHCOS entry for openshift_version "4.22"
(cpu_architecture "arm64") uses the old ec.3 URL/version; update its "url" and
"version" to match the ec.5 build used by x86_64/ppc64le/s390x (replace the ec.3
path segment with ec.5 and bump the version string to the same
"9.6.20251023-0"), and then propagate the identical ec.5 arm64 URL change to the
corresponding sample/operator/template blobs that still reference the stale
arm64 URL so all 4.22 architectures and release-image entries are consistent.
---
Nitpick comments:
In `@openshift/template.yaml`:
- Around line 20-23: The template currently hardcodes OS_IMAGES and
RELEASE_IMAGES JSON arrays, causing duplication with data/default_os_images.json
and data/default_release_images.json; change the template generation so
OS_IMAGES and RELEASE_IMAGES are populated from those single-source JSON files
instead of being hand-edited: update the template build step (or template
renderer) to read data/default_os_images.json and
data/default_release_images.json and inject their contents into the template
value fields for OS_IMAGES and RELEASE_IMAGES so the manifest no longer contains
duplicated, manually maintained arrays.
ℹ️ Review info
⚙️ Run configuration
Configuration used: Organization UI
Review profile: CHILL
Plan: Pro
Run ID: 05080c11-4e6f-4f9d-8096-1911284dd706
📒 Files selected for processing (7)
config/manager/manager.yamlconfig/samples/agent-install.openshift.io_v1beta1_agentserviceconfig.yamldata/default_os_images.jsondata/default_release_images.jsondeploy/olm-catalog/manifests/assisted-service-operator.clusterserviceversion.yamldeploy/podman/configmap.ymlopenshift/template.yaml
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## master #10128 +/- ##
=======================================
Coverage 44.28% 44.28%
=======================================
Files 415 415
Lines 72709 72709
=======================================
+ Hits 32196 32199 +3
+ Misses 37601 37599 -2
+ Partials 2912 2911 -1 🚀 New features to boost your workflow:
|
|
@danmanor: all tests passed! Full PR test history. Your PR dashboard. DetailsInstructions 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. |
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: danmanor, gamli75 The full list of commands accepted by this bot can be found here. The pull request process is described here DetailsNeeds approval from an approver in each of these files:
Approvers can indicate their approval by writing |
4 participants
OpenShift updates: 4.22.0-ec.4 -> 4.22.0-ec.5, 4.20.17-multi -> 4.20.18-multi, 4.18.36 -> 4.18.37, 4.20.17 -> 4.20.18, 4.22.0-ec.4-multi -> 4.22.0-ec.5-multi, 4.18.36-multi -> 4.18.37-multi
RHCOS updates: 4.22.0-ec.3 -> 4.22.0-ec.5
/test edge-e2e-metal-assisted-4-18 edge-e2e-metal-assisted-4-20 edge-e2e-metal-assisted-4-22
/cc @rccrdpccl @gamli75