Skip to content

Commit 3ac947c

Browse files
committed
Revert "revert back to go1.23 since downstream not ready for go1.24 yet"
This reverts commit 39d118e. Signed-off-by: Andrew McDermott <[email protected]>
1 parent 4bd625b commit 3ac947c

File tree

5 files changed

+10
-13
lines changed

5 files changed

+10
-13
lines changed

.github/workflows/integration_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
runs-on: ubuntu-24.04
1414
strategy:
1515
matrix:
16-
go: ["1.23"]
16+
go: ["1.24"]
1717
oci_bin: ["docker", "podman"]
1818
env:
1919
BPFMAN_AGENT_IMG: quay.io/bpfman/bpfman-agent:int-test

.github/workflows/pull_request.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
go: ["1.23"]
23+
go: ["1.24"]
2424
arch:
2525
- arch: amd64
2626
filename: linux-x86_64
@@ -59,7 +59,7 @@ jobs:
5959
run: make test
6060

6161
- name: Archive Go code coverage results
62-
if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.23' }}
62+
if: ${{ matrix.arch.arch == 'amd64' && matrix.go == '1.24' }}
6363
uses: actions/upload-artifact@v4
6464
with:
6565
name: coverage-go

Containerfile.bpfman-agent

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the manager binary
22
ARG BUILDPLATFORM
33

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

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

2727

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

3838
WORKDIR /usr/src/cri-tools
3939
ARG CRI_REPO_URL=https://github.com/kubernetes-sigs/cri-tools
40-
ARG CRI_REPO_TAG=v1.32.0
40+
ARG CRI_REPO_BRANCH=master
4141

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

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

4848
# Use the fedora minimal image to reduce the size of the final image but still

Containerfile.bpfman-operator

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Build the manager binary
22
ARG BUILDPLATFORM
33

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

66
ARG BUILDPLATFORM
77

go.mod

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/bpfman/bpfman-operator
22

3-
go 1.23.0
4-
5-
toolchain go1.23.5
3+
go 1.24.0
64

75
require (
86
github.com/bpfman/bpfman v0.5.7-0.20250305151919-a74c631c3643
@@ -62,7 +60,6 @@ require (
6260
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
6361
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.0 // indirect
6462
sigs.k8s.io/gateway-api v1.1.0 // indirect
65-
sigs.k8s.io/yaml v1.4.0 // indirect
6663
)
6764

6865
require (

0 commit comments

Comments
 (0)