Skip to content

Periodic sync of supported OCP samples#695

Open
aroyoredhat wants to merge 1 commit into
openshift:mainfrom
aroyoredhat:periodic-ocp-sync
Open

Periodic sync of supported OCP samples#695
aroyoredhat wants to merge 1 commit into
openshift:mainfrom
aroyoredhat:periodic-ocp-sync

Conversation

@aroyoredhat
Copy link
Copy Markdown
Contributor

@aroyoredhat aroyoredhat commented May 4, 2026

Syncing the latest supported OCP samples from the library.

Created using https://github.com/aroyoredhat/trigger-test-samples-build

Summary by CodeRabbit

  • Bug Fixes

    • Corrected missing container image specifications in Rails and PostgreSQL deployment templates across all architectures.
  • New Features

    • Added PHP 8.4 support on UBI 10.
    • Expanded Node.js 22 support across additional architectures and UBI versions.
  • Deprecations

    • Removed Node.js 20 image variants.

@coderabbitai
Copy link
Copy Markdown

coderabbitai Bot commented May 4, 2026

Walkthrough

Replace blank image values in Rails/PostgreSQL deployment templates and update Node.js/PHP ImageStream tag sets across multiple architecture-specific OpenShift manifests.

Changes

Container Image Template Variables

Layer / File(s) Summary
Rails & PostgreSQL Image Configuration
assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json, assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json, assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json, assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json
Rails main container and init container image fields set to ${NAME}:latest; PostgreSQL container image field set to postgresql:${POSTGRESQL_VERSION}. Same changes applied uniformly across all four architecture-specific template variants.

ImageStream Tag Updates

Layer / File(s) Summary
Node.js ImageStream tag replacements
assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json, assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json, assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json, assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json
Removed Node.js 20-* tag entries and replaced/shifted them to 22-* variants (including -minimal and UBI10 entries) across all architecture-specific Node.js ImageStreams; latest continues to point to a 22-ubi9 tag where present.
PHP ImageStream 8.4 addition and latest repointing
assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json, assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json, assets/operator/ocp-s390x/php/imagestreams/php-rhel.json, assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json
Added 8.4-ubi10 ImageStreamTag entries pointing to registry.redhat.io/ubi10/php-84:latest and updated the latest ImageStreamTag metadata to reference 8.4-ubi10 (PHP 8.4) across architectures.

Estimated code review effort

🎯 3 (Moderate) | ⏱️ ~20 minutes


Important

Pre-merge checks failed

Please resolve all errors before merging. Addressing warnings is optional.

❌ Failed checks (1 error)

Check name Status Explanation Resolution
Ote Binary Stdout Contract ❌ Error test/e2e/main_test.go TestMain() function contains 7 fmt.Print/Printf/Println calls (lines 38, 44, 52, 57, 62, 74, 77) that write directly to stdout, violating the OTE Binary Stdout Contract. Replace all fmt.Printf/Println calls in test/e2e/main_test.go's TestMain() and waitForOperator() with os.Stderr writes or suppress output entirely to prevent stdout corruption.
✅ 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 'Periodic sync of supported OCP samples' accurately describes the main objective of the pull request, which syncs OpenShift Container Platform samples and updates multiple template and ImageStream configurations across different architectures.
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 This repository uses standard Go testing (not Ginkgo), no test files were modified in this PR, only JSON config files were updated.
Test Structure And Quality ✅ Passed The check does not apply to this PR. The repository uses Go standard testing.T framework, not Ginkgo; no Ginkgo test code exists to review.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR; changes are only to JSON configuration files for OCP samples and imagestreams, making this check not applicable.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests are added in this PR. The changes consist of JSON template and imagestream configuration updates only.
Topology-Aware Scheduling Compatibility ✅ Passed Changes only update container image references in templates and imagestream tags; no scheduling constraints are introduced.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed This PR contains only JSON configuration files (OpenShift templates and ImageStream definitions). No Ginkgo e2e test files (Go test files) were added or modified. The custom check does not apply.
✨ 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 requested review from fbm3307 and shannon May 4, 2026 02:32
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 4, 2026

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: aroyoredhat

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 May 4, 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.

Actionable comments posted: 1

🤖 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.

Inline comments:
In `@assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json`:
- Around line 166-176: Verify that the backing image referenced by the PHP 8.4
(Latest) imagestream is actually available and pullable: check
registry.redhat.io for registry.redhat.io/ubi10/php-84:latest and attempt a
docker/podman pull (using Red Hat credentials if required); if the image is
missing or not accessible, update the imagestream "from.name" value (currently
"8.4-ubi10") to a valid ImageStreamTag or explicit image reference that exists,
or add a note in the imagestream metadata documenting that Red Hat registry
credentials are required and provide the correct pullspec to avoid deployment
failures.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

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

Review profile: CHILL

Plan: Enterprise

Run ID: 61022e20-2acf-4d92-b17b-3e93898b2550

📥 Commits

Reviewing files that changed from the base of the PR and between e4a284d and 7a9f263.

📒 Files selected for processing (12)
  • assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json
  • assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json
  • assets/operator/ocp-aarch64/rails/templates/rails-pgsql-persistent.json
  • assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-ppc64le/php/imagestreams/php-rhel.json
  • assets/operator/ocp-ppc64le/rails/templates/rails-pgsql-persistent.json
  • assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-s390x/php/imagestreams/php-rhel.json
  • assets/operator/ocp-s390x/rails/templates/rails-pgsql-persistent.json
  • assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-x86_64/php/imagestreams/php-rhel.json
  • assets/operator/ocp-x86_64/rails/templates/rails-pgsql-persistent.json
💤 Files with no reviewable changes (4)
  • assets/operator/ocp-ppc64le/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-s390x/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-x86_64/nodejs/imagestreams/nodejs-rhel.json
  • assets/operator/ocp-aarch64/nodejs/imagestreams/nodejs-rhel-aarch64.json

Comment on lines +166 to +176
"description": "Build and run PHP 8.4 applications on UBI 10. For more information about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md.\n\nWARNING: By selecting this tag, your application will automatically update to use the latest version available on OpenShift, including major version updates.\n",
"iconClass": "icon-php",
"openshift.io/display-name": "PHP 8.3 (Latest)",
"openshift.io/display-name": "PHP 8.4 (Latest)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"sampleRepo": "https://github.com/sclorg/cakephp-ex.git",
"tags": "builder,php",
"version": "8.3"
"version": "8.4"
},
"from": {
"kind": "ImageStreamTag",
"name": "8.3-ubi10"
"name": "8.4-ubi10"
Copy link
Copy Markdown

Choose a reason for hiding this comment

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

⚠️ Potential issue | 🟡 Minor | ⚡ Quick win

🧩 Analysis chain

🏁 Script executed:

#!/bin/bash
# Verify PHP 8.4 UBI10 image is pullable and documentation exists

# Check if the PHP 8.4 documentation exists
curl -s -o /dev/null -w "%{http_code}" https://github.com/sclorg/s2i-php-container/blob/master/8.4/README.md

# Note: Image registry verification would require authentication to registry.redhat.io
echo "Manual verification needed: Confirm registry.redhat.io/ubi10/php-84:latest is available in Red Hat registry"

Repository: openshift/cluster-samples-operator

Length of output: 189


Confirm PHP 8.4 “Latest” docs and manually verify backing image availability

In assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json, the PHP 8.4 (Latest) stream points to 8.4-ubi10; the linked s2i-php-container 8.4 README URL is reachable (HTTP 200). Still confirm that registry.redhat.io/ubi10/php-84:latest exists and is pullable (may require Red Hat registry credentials) to prevent deployment failures.

🤖 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 `@assets/operator/ocp-aarch64/php/imagestreams/php-rhel-aarch64.json` around
lines 166 - 176, Verify that the backing image referenced by the PHP 8.4
(Latest) imagestream is actually available and pullable: check
registry.redhat.io for registry.redhat.io/ubi10/php-84:latest and attempt a
docker/podman pull (using Red Hat credentials if required); if the image is
missing or not accessible, update the imagestream "from.name" value (currently
"8.4-ubi10") to a valid ImageStreamTag or explicit image reference that exists,
or add a note in the imagestream metadata documenting that Red Hat registry
credentials are required and provide the correct pullspec to avoid deployment
failures.

@aroyoredhat
Copy link
Copy Markdown
Contributor Author

/retest-required

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented May 25, 2026

@aroyoredhat: 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-aws 7a9f263 link true /test e2e-aws
ci/prow/e2e-aws-ovn-image-ecosystem 7a9f263 link true /test e2e-aws-ovn-image-ecosystem

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.

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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant