Skip to content

Update OLM registry builder to v4.21 to fix CVE-2025-68121 #689

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 1 commit into from
Mar 4, 2026
+1 −1
Merged

Update OLM registry builder to v4.21 to fix CVE-2025-68121 #689

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion boilerplate/openshift/golang-osd-operator/Dockerfile.olm-registry
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.19 AS builder
FROM registry.redhat.io/openshift4/ose-operator-registry-rhel9:v4.21 AS builder
Copy link
Contributor

@joshbranham joshbranham Mar 4, 2026

Choose a reason for hiding this comment

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

You should build an operators catalog registry with this and ensure you can run it

Copy link
Contributor Author

@BATMAN-JD BATMAN-JD Mar 4, 2026 •
edited
Loading

Choose a reason for hiding this comment

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

For sure. I did actually already test this prior to submitting. I built an image locally with these changes and scanned it with trivy. Once I verified the CVE was not found I pushed the image. I then deployed in a test cluster I had running and pointed the catalog to that image.

1. Built OLM catalog registry locally with v4.21:

podman build -f build/Dockerfile.olm-registry \
  --build-arg SAAS_OPERATOR_DIR=saas-aws-account-operator-bundle \
  -t test-aws-account-operator-registry:SREP-3588 .
Build succeeded: 257 MB image

2. Scanned for CVE-2025-68121:
trivy image localhost/test-aws-account-operator-registry:SREP-3588
Result: Total: 64 (UNKNOWN: 0, LOW: 44, MEDIUM: 20, HIGH: 0, CRITICAL: 0)
✅ CVE-2025-68121 not found - confirmed fix

3. Pushed to Quay for testing:
podman tag localhost/test-aws-account-operator-registry:SREP-3588 \
  quay.io/jdownie/aws-account-operator-registry:test-SREP-3588
podman push quay.io/jdownie/aws-account-operator-registry:test-SREP-3588

4. Deployed to test cluster (test-jdownie-cluster-odc):
- Created CatalogSource pointing to quay.io/jdownie/aws-account-operator-registry:test-SREP-3588
- CatalogSource pod: Running
- CSV installation: Succeeded

The v4.21 builder produces a working OLM catalog registry that successfully deploys and runs.

ARG SAAS_OPERATOR_DIR
COPY ${SAAS_OPERATOR_DIR} manifests
RUN initializer --permissive
Expand Down