Skip to content
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

Fix CVE 2024 48957 and CVE 2024 48958 #6880

Closed
wants to merge 4 commits into from
Closed

Fix CVE 2024 48957 and CVE 2024 48958 #6880

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0b0eba7
Bump helm to version 3.14.2 to fix critical vulnerability GHSA-r53h-j…
jordigilh Jul 16, 2024
94192d5
custom changes to build the orchestrator-helm-operator
jordigilh Oct 9, 2024
aa950b7
Fix CVES in the golang crypto and net libraries
jordigilh Dec 19, 2024
f306d28
Merge branch 'master' into fix_cve_2024_48957_and_cve_2024_48958
jordigilh Dec 19, 2024
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: 2 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,12 +97,12 @@ build/scorecard-test build/scorecard-test-kuttl build/custom-scorecard-tests:

# Convenience wrapper for building all remotely hosted images.
.PHONY: image-build
IMAGE_TARGET_LIST = operator-sdk helm-operator scorecard-test scorecard-test-kuttl
IMAGE_TARGET_LIST = helm-operator
image-build: $(foreach i,$(IMAGE_TARGET_LIST),image/$(i)) ## Build all images.


# Build an image.
BUILD_IMAGE_REPO = quay.io/operator-framework
BUILD_IMAGE_REPO = quay.io/jordigilh
# When running in a terminal, this will be false. If true (ex. CI), print plain progress.
ifneq ($(shell test -t 0; echo $$?),0)
DOCKER_PROGRESS = --progress plain
Expand Down
6 changes: 6 additions & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,3 +257,9 @@ require (
sigs.k8s.io/kustomize/kyaml v0.14.3-0.20230601165947-6ce0bf390ce3 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace (
github.com/docker/docker => github.com/docker/docker v25.0.6+incompatible // indirect
golang.org/x/crypto => golang.org/x/crypto v0.31.0 //indirect
golang.org/x/net => golang.org/x/net v0.23.0 //indirect
)
2 changes: 1 addition & 1 deletion images/helm-operator/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Build the manager binary
FROM --platform=$BUILDPLATFORM golang:1.22 AS builder
FROM --platform=$BUILDPLATFORM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 as builder
ARG TARGETARCH

WORKDIR /workspace
Expand Down
Loading