Skip to content

CP-47362: Report grype findings in the CI log #1003

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
evan-cz merged 2 commits into from
Sep 4, 2026
+14 −3
Merged

CP-47362: Report grype findings in the CI log #1003

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2c0db27
CP-47362: Report grype findings in the CI log
evan-cz Sep 4, 2026
b54949e
CP-47363: Upgrade prometheus-config-reloader to v0.93.1
evan-cz Sep 4, 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
4 changes: 4 additions & 0 deletions .github/workflows/docker-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,6 +302,10 @@ jobs:
image: ${{ env.REGISTRY_PROD_ADDR }}/${{ env.UNTESTED_IMAGE_NAME }}:${{ steps.meta.outputs.version }}
fail-build: true
severity-cutoff: high
# Print findings to the log. The action otherwise defaults to
# SARIF written to a temp file nothing here reads, so a failure
# says findings exist without saying what they are.
output-format: table

k8s-version-matrix-tests:
# These should match the permissions in the called workflow.
Expand Down
4 changes: 4 additions & 0 deletions .github/workflows/scan-images.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,7 @@ jobs:
image: ${{ env.REGISTRY }}:${{ matrix.tag }}
fail-build: true
severity-cutoff: high
# Print findings to the log. The action otherwise defaults to
# SARIF written to a temp file nothing here reads, so a failure
# says findings exist without saying what they are.
output-format: table
9 changes: 6 additions & 3 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ARG DEPLOY_IMAGE=scratch

# prometheus-config-reloader version, built from source in the "reloader" stage.
# Git tag — Dependabot can't track it, so bump by hand (see DEVELOPMENT.md).
ARG RELOADER_VERSION=v0.91.0
ARG RELOADER_VERSION=v0.93.1

# Multi-stage Docker build with platform-specific cache optimization:
# 1. base-tools: Install system packages and tools (cached per platform)
Expand Down Expand Up @@ -90,9 +90,12 @@ WORKDIR /reloader-src
RUN git clone --depth 1 --branch "${RELOADER_VERSION}" \
https://github.com/prometheus-operator/prometheus-operator.git .

# Bump vulnerable deps ahead of upstream's pins so the scan passes; drop when upstream catches up.
# Upstream still ships x/crypto v0.54.0, which has GO-2026-6303, GO-2026-6354
# and GO-2026-6355 open against it. This is an exact version and so downgrades
# as readily as it upgrades: check what upstream resolves before touching it,
# and delete it once upstream passes it rather than bumping it forever.
RUN --mount=type=cache,target=/go/pkg/mod,id=gomod-reloader-$TARGETPLATFORM \
go get golang.org/x/crypto@v0.53.0 golang.org/x/net@v0.56.0 golang.org/x/text@v0.39.0
go get golang.org/x/crypto@v0.56.0

RUN --mount=type=cache,target=/go/pkg/mod,id=gomod-reloader-$TARGETPLATFORM \
--mount=type=cache,target=/root/.cache/go-build,id=gobuild-reloader-$TARGETPLATFORM \
Expand Down
Loading