Skip to content

Fixing CVE-2026-25679 #433

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

Open
npecka wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixing CVE-2026-25679 #433

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
6258e4d
Fixing CVE-2026-25679
npecka May 20, 2026
2e299d4
Update boilerplate to v8.3.6 for CVE-2026-25679
npecka May 20, 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
2 changes: 1 addition & 1 deletion .ci-operator.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
build_root_image:
name: boilerplate
namespace: openshift
tag: image-v8.3.4
tag: image-v8.3.6
2 changes: 1 addition & 1 deletion boilerplate/_data/backing-image-tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
image-v8.3.4
image-v8.3.6
2 changes: 1 addition & 1 deletion boilerplate/_data/last-boilerplate-commit
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
28f0d527a87f963961e218687f8e481acf62e47d
0d8c4f5b1d0cc0be7f35fa2d84430c112eb3a5f0
2 changes: 1 addition & 1 deletion boilerplate/openshift/golang-osd-e2e/update
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ mkdir -p "${E2E_SUITE_DIRECTORY}"

E2E_SUITE_BUILDER_IMAGE=registry.ci.openshift.org/openshift/release:rhel-9-release-golang-1.25-openshift-4.21
if [[ -n ${KONFLUX_BUILDS} ]]; then
E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25"
E2E_SUITE_BUILDER_IMAGE="brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25.8"
fi

echo "syncing ${E2E_SUITE_DIRECTORY}/Dockerfile"
Expand Down
4 changes: 2 additions & 2 deletions build/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v8.3.4 AS builder
FROM quay.io/redhat-services-prod/openshift/boilerplate:image-v8.3.6 AS builder
COPY . /go/src/github.com/openshift/splunk-forwarder-operator
WORKDIR /go/src/github.com/openshift/splunk-forwarder-operator
RUN make go-build

FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1777460003
ENV OPERATOR_PATH=/go/src/github.com/openshift/splunk-forwarder-operator \
OPERATOR_BIN=splunk-forwarder-operator

Expand Down
2 changes: 1 addition & 1 deletion build/Dockerfile.olm-registry
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ COPY ${SAAS_OPERATOR_DIR} manifests
RUN initializer --permissive

# ubi-micro does not work for clusters with fips enabled unless we make OpenSSL available
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.7-1778562320
FROM registry.access.redhat.com/ubi9/ubi-minimal:9.8-1777460003

COPY --from=builder /bin/registry-server /bin/registry-server
COPY --from=builder /bin/grpc_health_probe /bin/grpc_health_probe
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# THIS FILE IS GENERATED BY BOILERPLATE. DO NOT EDIT.
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25 as builder
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.25.8 as builder
WORKDIR /go/src/github.com/openshift/splunk-forwarder-operator/
COPY . .
RUN CGO_ENABLED=0 GOFLAGS="-mod=mod" go test ./test/e2e -v -c --tags=osde2e -o /e2e.test
Expand Down
Loading