Skip to content

NE-2218: Update router base image for OKD to OCP 5.0 - #82170

Merged
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
jcmoraisjr:NE-2218-router-okd-base-image
Jul 23, 2026
Merged

NE-2218: Update router base image for OKD to OCP 5.0#82170
openshift-merge-bot[bot] merged 1 commit into
openshift:mainfrom
jcmoraisjr:NE-2218-router-okd-base-image

Conversation

@jcmoraisjr

@jcmoraisjr jcmoraisjr commented Jul 20, 2026

Copy link
Copy Markdown
Member

Update router base image for OKD to OCP 5.0. This is a pre requisite to update the installed HAProxy version in router image to 3.2.

https://redhat.atlassian.net/browse/NE-2218

Summary by CodeRabbit

  • Updates the OpenShift CI router configuration (ci-operator/config/openshift/router/openshift-router-master__okd-scos.yaml) to move the haproxy-router-base build from the SCOS 4.22 base to the SCOS 5.0 base, and switches the related OCP builder image tag from the OpenShift 4.22 variant to the OpenShift 5.0 variant.
  • This updates the OKD router CI toolchain prerequisite required to later bump the router’s bundled HAProxy version to 3.2 (tracked in NE-2218).

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

openshift-ci-robot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

@jcmoraisjr: This pull request references NE-2218 which is a valid jira issue.

Details

In response to this:

Update router base image for OKD to OCP 5.0. This is a pre requisite to update the installed HAProxy version in router image to 3.2.

https://redhat.atlassian.net/browse/NE-2218

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.

@coderabbitai

coderabbitai Bot commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

Walkthrough

The router CI configuration updates the haproxy-router-base build to use SCOS 5.0 and the OpenShift 5.0 builder image instead of the corresponding 4.22 images.

Changes

Router build inputs

Layer / File(s) Summary
Update router build inputs
ci-operator/config/openshift/router/openshift-router-master__okd-scos.yaml
The haproxy-router-base image references the SCOS 5.0 base image and OpenShift 5.0 builder image.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Suggested reviewers: miciah, rikatz, pskrbasu

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
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 The PR only changes a ci-operator YAML; no Ginkgo test files or test titles were added or edited.
Test Structure And Quality ✅ Passed Only a CI config YAML changed; no Ginkgo tests were added or modified, so the test-quality checklist is not applicable.
Microshift Test Compatibility ✅ Passed Only ci-operator YAML changed; no new Ginkgo test bodies or test files were added, so MicroShift compatibility check is not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed Only a ci-operator YAML image-base update changed; no new Ginkgo e2e tests or SNO-sensitive logic were added.
Topology-Aware Scheduling Compatibility ✅ Passed Only a ci-operator image config changed; no deployment manifests, controllers, affinity, replicas, selectors, or PDBs were modified.
Ote Binary Stdout Contract ✅ Passed Only a CI config YAML changed; no binary code, test setup, or stdout writes were modified, so the OTE stdout contract is unaffected.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only ci-operator YAML image inputs changed; no new Ginkgo e2e tests or network logic were added, and the tests stanza is unchanged.
No-Weak-Crypto ✅ Passed Only a CI YAML image-reference update changed; no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB, custom crypto, or secret-comparison code appears in the diff.
Container-Privileges ✅ Passed Diff only switches router image bases to SCOS 5.0; the changed YAML contains no privileged, host* , SYS_ADMIN, or allowPrivilegeEscalation settings.
No-Sensitive-Data-In-Logs ✅ Passed Only CI image references changed; no log statements or sensitive-data fields appear in the diff or file.
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title accurately summarizes the main change: updating the OKD router base image to OCP 5.0.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-ci
openshift-ci Bot requested review from Miciah and rikatz July 20, 2026 17:28
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jul 20, 2026
@gcs278

gcs278 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

/assign

Update router base image for OKD to OCP 5.0. This is a pre requisite to
update the installed HAProxy version in router image to 3.2.

https://redhat.atlassian.net/browse/NE-2218
@jcmoraisjr
jcmoraisjr force-pushed the NE-2218-router-okd-base-image branch from fc09167 to 4f36bd3 Compare July 20, 2026 18:13
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@jcmoraisjr: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-openshift-router-master-okd-scos-e2e-aws-ovn openshift/router presubmit Ci-operator config changed
pull-ci-openshift-router-master-okd-scos-images openshift/router presubmit Ci-operator config changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@gcs278

gcs278 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openshift-router-master-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@gcs278: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@gcs278

gcs278 commented Jul 20, 2026

Copy link
Copy Markdown
Contributor

^ pj rehearse should fail due to centos10 not having PCRE1 RPM when trying to install haproxy28

@pskrbasu

Copy link
Copy Markdown
Contributor

/lgtm

@pskrbasu

Copy link
Copy Markdown
Contributor

/cc @Prashanth684

@openshift-ci
openshift-ci Bot requested a review from Prashanth684 July 21, 2026 12:20
@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jul 21, 2026
@openshift-ci

openshift-ci Bot commented Jul 21, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jcmoraisjr, pskrbasu

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

@gcs278

gcs278 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

openshift/router#792 has merged. We need to merge this now.

@gcs278

gcs278 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

/pj-rehearse pull-ci-openshift-router-master-okd-scos-images

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@gcs278: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@gcs278

gcs278 commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

/pj-rehearse ack

@openshift-merge-bot

Copy link
Copy Markdown
Contributor

@gcs278: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

@openshift-merge-bot openshift-merge-bot Bot added the rehearsals-ack Signifies that rehearsal jobs have been acknowledged label Jul 23, 2026
@openshift-ci

openshift-ci Bot commented Jul 23, 2026

Copy link
Copy Markdown
Contributor

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

@openshift-merge-bot
openshift-merge-bot Bot merged commit 92213a0 into openshift:main Jul 23, 2026
15 checks passed
@jcmoraisjr
jcmoraisjr deleted the NE-2218-router-okd-base-image branch July 23, 2026 22:28
apahim pushed a commit to apahim/release that referenced this pull request Jul 24, 2026
Update router base image for OKD to OCP 5.0. This is a pre requisite to
update the installed HAProxy version in router image to 3.2.

https://redhat.atlassian.net/browse/NE-2218
mrniranjan pushed a commit to mrniranjan/release that referenced this pull request Jul 28, 2026
Update router base image for OKD to OCP 5.0. This is a pre requisite to
update the installed HAProxy version in router image to 3.2.

https://redhat.atlassian.net/browse/NE-2218
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. 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.

4 participants