Skip to content

Switch to Go 1.24 (again) #439

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
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Switch to Go 1.24 (again) #439

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
3ac947c
Revert "revert back to go1.23 since downstream not ready for go1.24 yet"
frobware May 8, 2025
811d008
go mod tidy
frobware May 8, 2025
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 .github/workflows/integration_test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ jobs:
runs-on: ubuntu-24.04
strategy:
matrix:
go: ["1.23"]
go: ["1.24"]
oci_bin: ["docker", "podman"]
env:
BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/pull_request.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
strategy:
fail-fast: false
matrix:
go: ["1.23"]
go: ["1.24"]
arch:
- arch: amd64
filename: linux-x86_64
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
run: make test

- name: Archive Go code coverage results
if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.23' }}
if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.24' }}
uses: actions/upload-artifact@v4
with:
name: coverage-go
Expand Down
10 changes: 5 additions & 5 deletions Containerfile.bpfman-agent
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build the manager binary
ARG BUILDPLATFORM

FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS bpfman-agent-build
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS bpfman-agent-build

# The following ARGs are set internally by docker/build-push-action in github actions
ARG TARGETOS
Expand All @@ -25,7 +25,7 @@ COPY . .
RUN CGO_ENABLED=0 GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} go build -mod vendor -o bpfman-agent ./cmd/bpfman-agent/main.go


FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS cri-tools-build
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS cri-tools-build
# The following ARGs are set internally by docker/build-push-action in github actions
ARG TARGETOS
ARG TARGETARCH
Expand All @@ -37,12 +37,12 @@ RUN echo "TARGETOS=${TARGETOS} TARGETARCH=${TARGETARCH} BUILDPLATFORM=${BUILDP

WORKDIR /usr/src/cri-tools
ARG CRI_REPO_URL=https://github.com/kubernetes-sigs/cri-tools
ARG CRI_REPO_TAG=v1.32.0
ARG CRI_REPO_BRANCH=master
Copy link
Contributor

Choose a reason for hiding this comment

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

can u pls see if they have released new version so we can use it as new pinned tag instead of master ?


RUN git clone --depth 1 --branch $CRI_REPO_TAG $CRI_REPO_URL .
RUN git clone --depth 1 --branch $CRI_REPO_BRANCH $CRI_REPO_URL .

# Build
RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} VERSION=$CRI_REPO_TAG make
RUN GOOS=${TARGETOS:-linux} GOARCH=${TARGETARCH} VERSION="latest" make
RUN cp ./build/bin/${TARGETOS}/${TARGETARCH}/crictl .

# Use the fedora minimal image to reduce the size of the final image but still
Expand Down
2 changes: 1 addition & 1 deletion Containerfile.bpfman-operator
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Build the manager binary
ARG BUILDPLATFORM

FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.23 AS bpfman-operator-build
FROM --platform=$BUILDPLATFORM docker.io/library/golang:1.24 AS bpfman-operator-build

ARG BUILDPLATFORM

Expand Down
4 changes: 1 addition & 3 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
module github.com/bpfman/bpfman-operator

go 1.23.0

toolchain go1.23.5
go 1.24.0

require (
github.com/bpfman/bpfman v0.5.7-0.20250305151919-a74c631c3643
Expand Down
Loading