Skip to content

TRT-2931: pull postgres and redis sidecars from QCI - #4004

Merged
openshift-merge-bot[bot] merged 3 commits into
openshift:mainfrom
smg247:trt-2931-qci-sidecar-images
Sep 11, 2026
Merged

openshift-merge-bot[bot] merged 3 commits into
openshift:mainfrom
smg247:trt-2931-qci-sidecar-images

Conversation

@smg247

@smg247 smg247 commented Sep 10, 2026

Copy link
Copy Markdown
Member

/hold for openshift/release#84869

Summary

  • Pull postgres/redis sidecars from QCI instead of docker.io (quay.io/openshift/ci:ci_postgresql_postgresql-18-c9s, quay.io/openshift/ci:ci_redis_redis-7-c9s).
  • Use sclorg env vars (POSTGRESQL_*) and include the postgres password in agentic DSNs.

Test plan

Made with Cursor

Summary by CodeRabbit

  • Chores
    • Updated local development services to use standardized PostgreSQL and Redis images.
    • Improved PostgreSQL startup reliability with expanded readiness checks and configured database credentials.
    • Updated local database connection settings to consistently authenticate with the configured password.
    • No end-user-facing product behavior changes.

Stop pulling docker.io for the devcontainer sidecars. Use the sclorg
images mirrored to quay.io/openshift/ci, and pass the env vars those
images require.

Co-authored-by: Cursor <cursoragent@cursor.com>
@openshift-merge-bot

Copy link
Copy Markdown
Contributor

Pipeline controller notification
This repo is configured to use the pipeline controller. Second-stage tests will be triggered either automatically or after lgtm label is added, depending on the repository configuration. The pipeline controller will automatically detect which contexts are required and will utilize /test Prow commands to trigger the second stage.

For optional jobs, comment /test ? to see a list of all defined jobs. To trigger manually all jobs from second stage use /pipeline required command.

This repository is configured in: automatic mode

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

openshift-ci-robot commented Sep 10, 2026

Copy link
Copy Markdown

@smg247: This pull request references TRT-2931 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the spike to target the "5.1.0" version, but no target version was set.

Details

In response to this:

/hold for openshift/release#84869

Summary

  • Pull postgres/redis sidecars from QCI instead of docker.io (quay.io/openshift/ci:ci_postgresql_postgresql-18-c9s, quay.io/openshift/ci:ci_redis_redis-7-c9s).
  • Use sclorg env vars (POSTGRESQL_*) and include the postgres password in agentic DSNs.

Test plan

Made with Cursor

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 added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 10, 2026
@coderabbitai

coderabbitai Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

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: 9178b1d1-e579-4acc-b931-91df16a3f5d6

📥 Commits

Reviewing files that changed from the base of the PR and between 96324d0 and e1a552d.

📒 Files selected for processing (1)
  • .devcontainer/init-services.sh
💤 Files with no reviewable changes (1)
  • .devcontainer/init-services.sh

Included review availability: Your plan provides up to 12 included reviews per hour; 9 remain after this review.


Walkthrough

Local development services now use OpenShift CI PostgreSQL and Redis images. PostgreSQL readiness allows more time, database creation uses a password, and Sippy DSNs include that password.

Changes

Local service setup

Layer / File(s) Summary
Configure local service containers
.devcontainer/init-services.sh
PostgreSQL uses the OpenShift CI image with an admin password, a 60-second readiness timeout, and password-authenticated database commands. Redis uses the OpenShift CI image without memory-policy arguments.
Update Sippy database DSNs
hack/agentic_setup.sh
The primary and prodlike Sippy DSNs now include the PostgreSQL password. The seed DSN remains derived from the primary DSN.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to e1a55

Local PostgreSQL and Redis sidecars now use QCI images with password-authenticated PostgreSQL connections; no concrete merge-blocking issue is identified.

🚥 Pre-merge checks | ✅ 21
✅ Passed checks (21 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly identifies the main change: updating PostgreSQL and Redis sidecars to use QCI images.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check. Docstring coverage is scoped to functions touched by this diff. Analyzed 0 functions across 2…
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.
Go Error Handling ✅ Passed PASS. The authoritative pull-request diff changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. It changes shell commands and PostgreSQL DSN strings. It does not change any Go fil…
Sql Injection Prevention ✅ Passed PASS: The pull request does not introduce SQL injection. The only SQL commands are fixed strings for checking and creating the fixed prodlike database. They do not concatenate or interpolate user in…
Excessive Css In React Should Use Styles ✅ Passed PASS. The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. Both are shell scripts, and the added lines contain no React components, JSX, inline style objects, or…
Test Coverage For New Features ✅ Passed PASS. The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. The edits update local container images, environment variables, readiness timing, database setup crede…
Single Responsibility And Clear Naming ✅ Passed PASS. The pull request changes only two shell scripts. It introduces no package, struct, or method. The changed names are specific and contextual: POSTGRESQL_ADMIN_PASSWORD, pg_ready, `redis_ready…
Feature Documentation ✅ Passed PASS. The reviewed diff changes local PostgreSQL and Redis sidecar images, readiness timing, database creation authentication, and development DSNs. It does not change a product feature, data model, d…
Stable And Deterministic Test Names ✅ Passed The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. The diff adds no Ginkgo test declarations or test titles, and neither changed file contains Describe, `Con…
Test Structure And Quality ✅ Passed PASS: The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. The authoritative diff contains no Ginkgo test files or Ginkgo constructs. Therefore, the listed test-…
Microshift Test Compatibility ✅ Passed PASS — The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. The diff adds no Ginkgo e2e tests and does not reference MicroShift-incompatible OpenShift APIs or fe…
Single Node Openshift (Sno) Test Compatibility ✅ Passed PASS: The pull request changes only two shell scripts: .devcontainer/init-services.sh and hack/agentic_setup.sh. The authoritative diff contains no new Ginkgo declarations, test files, or topology…
Topology-Aware Scheduling Compatibility ✅ Passed PASS: The pull request changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. The diff updates local Podman PostgreSQL/Redis images, environment variables, readiness timing, databa…
Ote Binary Stdout Contract ✅ Passed PASS: The authoritative PR diff changes only .devcontainer/init-services.sh and hack/agentic_setup.sh, both shell scripts for local PostgreSQL/Redis setup and DSN configuration. The diff contains …
Ipv6 And Disconnected Network Test Compatibility ✅ Passed PASS: The reviewed range changes only .devcontainer/init-services.sh and hack/agentic_setup.sh. It adds no Ginkgo e2e tests or test declarations. The 127.0.0.1 port mappings and quay.io image …
No-Weak-Crypto ✅ Passed The pull request changes only PostgreSQL/Redis container setup, readiness handling, and PostgreSQL DSN credentials. The added lines contain no MD5, SHA1, DES, 3DES, RC4, Blowfish, or ECB usage, custom…
Container-Privileges ✅ Passed The pull request does not introduce a container privilege condition from the custom check. The changed Podman commands do not use --privileged, host PID/network/IPC options, SYS_ADMIN, capability …
No-Sensitive-Data-In-Logs ✅ Passed No changed code logs sensitive data. The pull request adds the PostgreSQL password to container environment arguments and DSN exports, but both scripts use no tracing, environment dump, or credential-…
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

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

@openshift-ci
openshift-ci Bot requested review from mstaeble and xueqzhan September 10, 2026 00:27
@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 10, 2026
@openshift-ci openshift-ci Bot added the ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review label Sep 10, 2026
smg247 and others added 2 commits September 9, 2026 20:29
POSTGRESQL_DATABASE=prodlike made sclorg create prodlike as the app DB.
Only set the admin password so the default postgres DB remains seed;
prodlike is still created afterwards.

Co-authored-by: Cursor <cursoragent@cursor.com>
Do not replace existing postgres/redis containers on rebuild. Print
the podman rm command so the user can recreate them.

Co-authored-by: Cursor <cursoragent@cursor.com>
@smg247

smg247 commented Sep 10, 2026

Copy link
Copy Markdown
Member Author

/test agentic-staging

@smg247

smg247 commented Sep 10, 2026

Copy link
Copy Markdown
Member Author

We are now waiting on openshift/release#84914 to merge before a retest of agentic-staging

@mstaeble mstaeble left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 10, 2026
@openshift-ci

openshift-ci Bot commented Sep 10, 2026

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mstaeble, smg247

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

@smg247

smg247 commented Sep 11, 2026

Copy link
Copy Markdown
Member Author

/test agentic-staging

@openshift-trt-agent

Copy link
Copy Markdown

Sippy Staging Environment

URL: https://metropolitan-application-gorgeous-installing.trycloudflare.com

This environment is built from this PR and will remain available for approximately 60 minutes (until ~12:39 UTC).

@smg247

smg247 commented Sep 11, 2026

Copy link
Copy Markdown
Member Author

/test lint

@smg247

smg247 commented Sep 11, 2026

Copy link
Copy Markdown
Member Author

/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 Sep 11, 2026
@smg247

smg247 commented Sep 11, 2026

Copy link
Copy Markdown
Member Author

/test e2e

@openshift-merge-bot
openshift-merge-bot Bot merged commit 2073a14 into openshift:main Sep 11, 2026
11 of 12 checks passed
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. ready-for-human-review Indicates a PR has been reviewed by automated tools and is ready for human review

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants