Skip to content

fix(ci): merge the AWS RDS global CA bundle into the RDS trust store #5447

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Sep 22, 2026
Merged

fix(ci): merge the AWS RDS global CA bundle into the RDS trust store #5447

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3132171
fix(ci): merge the AWS RDS global CA bundle into the RDS trust store
gustavolira Sep 18, 2026
d4aea13
fix(ci): keep the Vault CA path if writing the merged bundle fails
gustavolira Sep 18, 2026
e06d346
fix(ci): enforce HTTPS on the RDS bundle download redirects
gustavolira Sep 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions .ci/pipelines/env_variables.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,19 @@ AZURE_DB_4_HOST=$(cat /tmp/secrets/AZURE_DB_4_HOST)
# Database TLS certificates (file paths to PEM files from Vault)
# Store paths instead of content to avoid "Argument list too long" shell errors
RDS_DB_CERTIFICATES_PATH="/tmp/secrets/rds-db-certificates.pem"
# The Vault copy of the RDS bundle goes stale when AWS rotates CAs (and GSM
# cannot hold the full global bundle, RHDHBUGS-3744), which fails TLS with
# SELF_SIGNED_CERT_IN_CHAIN. Merge in the official AWS global trust bundle;
# fall back to the Vault copy alone when the download fails.
if curl -fsSL --proto '=https' --proto-redir '=https' --retry 3 --max-time 30 -o /tmp/rds-global-bundle.pem "https://truststore.pki.rds.amazonaws.com/global/global-bundle.pem"; then
# Keep the Vault path if writing the merged file fails entirely (errexit-safe).
if cat /tmp/rds-global-bundle.pem "$RDS_DB_CERTIFICATES_PATH" > /tmp/rds-db-certificates-merged.pem 2> /dev/null \
|| cp /tmp/rds-global-bundle.pem /tmp/rds-db-certificates-merged.pem; then
RDS_DB_CERTIFICATES_PATH="/tmp/rds-db-certificates-merged.pem"
fi
else
echo "WARNING: could not download the AWS RDS global certificate bundle; using the Vault copy only"
fi
AZURE_DB_CERTIFICATES_PATH="/tmp/secrets/azure-db-certificates.pem"

JUNIT_RESULTS="junit-results.xml"
Expand Down
Loading