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

calico-3.29/3.29.1-r0: cve remediation #36566

Merged
merged 3 commits into from
Dec 14, 2024
Merged

calico-3.29/3.29.1-r0: cve remediation #36566

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e664f3
calico-3.29/3.29.1-r0: fix GHSA-v778-237x-gjrc
octo-sts[bot] Dec 12, 2024
5265d44
Updated previous gobump to patch this new CVE
hbh7 Dec 13, 2024
5e87972
using go/bump instead of go mod -edit
debasishbsws Dec 14, 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
11 changes: 5 additions & 6 deletions calico-3.29.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package:
name: calico-3.29
version: 3.29.1
epoch: 0
epoch: 1
description: "Cloud native networking and network security"
copyright:
- license: Apache-2.0
Expand Down Expand Up @@ -66,6 +66,10 @@ pipeline:
repository: https://github.com/projectcalico/calico
tag: v${{package.version}}
expected-commit: ddfc3b1ea724e2580c68d34950f0ccd318ae3ebf
- uses: go/bump
with:
deps: golang.org/x/[email protected]
replaces: golang.org/x/crypto=golang.org/x/[email protected]
- working-directory: felix
pipeline:
# Equivalent to target: "build-bpf"
Expand Down Expand Up @@ -175,11 +179,6 @@ subpackages:
LDFLAGS="$LDFLAGS -X node/buildinfo.BuildDate=$(date -u +'%FT%T%z')"
LDFLAGS="$LDFLAGS -X node/buildinfo.GitRevision=$(git rev-parse HEAD || echo '<unknown>')"

# Mitigate CVE-2023-48795
go mod edit -replace=golang.org/x/crypto=golang.org/x/[email protected]

go mod tidy

CGO_ENABLED=1 \
CGO_LDFLAGS="$CGO_LDFLAGS" \
CGO_CFLAGS="$CGO_CFLAGS" \
Expand Down
Loading