fix(ci): merge the AWS RDS global CA bundle into the RDS trust store - #5447
Open
gustavolira wants to merge 3 commits into
Open
gustavolira wants to merge 3 commits into
gustavolira wants to merge 3 commits into
Conversation
Codecov Report✅ All modified and coverable lines are covered by tests. Additional details and impacted files@@ Coverage Diff @@
## main #5447 +/- ##
===========================================
- Coverage 74.21% 64.04% -10.17%
===========================================
Files 69 57 -12
Lines 799 573 -226
Branches 125 99 -26
===========================================
- Hits 593 367 -226
Misses 205 205
Partials 1 1
Continue to review full report in Codecov by Harness.
🚀 New features to boost your workflow:
|
Contributor
|
The container image build workflow finished with status: |
Contributor
|
The container image build workflow finished with status: |
Member
Author
|
/tes e2e-osd-gcp-helm-nightly |
Member
Author
|
/test e2e-ocp-helm-nightly |
1 similar comment
Member
Author
|
/test e2e-ocp-helm-nightly |
gustavolira
force-pushed
the
fix/rds-ca-global-bundle
branch
from
September 18, 2026 18:25
3aec0e3 to
cde1ff6
Compare
Contributor
Member
Author
|
/test e2e-ocp-helm-nightly |
The RDS TLS e2e tests fail with SELF_SIGNED_CERT_IN_CHAIN on all four RDS instances: the Vault copy of rds-db-certificates.pem no longer validates the servers' certificate chains (AWS rotates RDS CAs, and GSM cannot hold the full global bundle — RHDHBUGS-3744 — so the stored copy is a trimmed snapshot that goes stale). Download the official AWS RDS global trust bundle at env-setup time and merge the Vault copy into it, pointing RDS_DB_CERTIFICATES_PATH at the merged file. Both consumers pick it up: the harness pg client (clearDatabase) and the postgres-crt secret mounted into RHDH (configurePostgresCertificate). If the download fails, fall back to the Vault copy alone (current behavior). Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
Review follow-up: under errexit a double failure of the cat/cp fallback chain would abort the whole job before the cleanup trap is installed; guard it and keep pointing at the Vault copy in that case. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
SonarCloud: curl -L could follow a redirect to a non-HTTPS target; restrict both the initial request and any redirect to HTTPS. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
gustavolira
force-pushed
the
fix/rds-ca-global-bundle
branch
from
September 18, 2026 20:40
cde1ff6 to
e06d346
Compare
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The RDS TLS e2e tests in
showcase-runtimefail withself-signed certificate in certificate chainon all four RDS instances (latest .. latest-3) — seen one2e-osd-gcp-helm-nightly,e2e-ocp-helm-nightlyand the operator variants (RHDHBUGS-3411, RHDHBUGS-3691).Root cause
RDS_DB_CERTIFICATES_PATHpoints at the Vault copy of the RDS CA bundle. AWS rotates RDS CAs, and GSM cannot store the full ~170KB global bundle (RHDHBUGS-3744), so the stored copy is a trimmed snapshot that goes stale — the harness pg client (clearDatabase) and RHDH itself (via thepostgres-crtsecret) then reject the servers' chains.Fix
At env-setup time, download the official AWS RDS global trust bundle and merge the Vault copy into it, pointing
RDS_DB_CERTIFICATES_PATHat the merged file. Every current and future RDS CA generation/region validates, custom CAs from Vault are preserved, and if the download fails the behavior falls back to today's (Vault copy only, with a warning).🤖 Generated with Claude Code