Skip to content

Commit 11bfefa

Browse files
committed
Build with go 1.24
1 parent d8cac91 commit 11bfefa

File tree

3 files changed

+5
-9
lines changed

3 files changed

+5
-9
lines changed

.github/workflows/ci.yml

+2-4
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ on:
1515
- prep-v[1-9].*
1616

1717
env:
18-
BUILDTIME_BASE: "golang:1.23.6-alpine3.21"
19-
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
20-
# https://github.com/cloudnativelabs/kube-router/issues/1676
18+
BUILDTIME_BASE: "golang:1.24.1-alpine3.21"
2119
RUNTIME_BASE: "alpine:3.21"
22-
GO_VERSION: "~1.23.6"
20+
GO_VERSION: "~1.24.1"
2321
GO_CACHE: "/home/runner/.cache/go-build"
2422
GO_MOD_CACHE: "/home/runner/go/pkg/mod"
2523

Makefile

+1-3
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,12 @@ DOCKER=$(if $(or $(IN_DOCKER_GROUP),$(IS_ROOT),$(OSX)),docker,sudo docker)
1717
MAKEFILE_DIR=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
1818
UPSTREAM_IMPORT_PATH=$(GOPATH)/src/github.com/cloudnativelabs/kube-router/
1919
BUILD_IN_DOCKER?=true
20-
DOCKER_BUILD_IMAGE?=golang:1.23.6-alpine3.21
20+
DOCKER_BUILD_IMAGE?=golang:1.24.1-alpine3.21
2121
## These variables are used by the Dockerfile as the bases for building and creating the runtime container
2222
## During CI these come from .github/workflows/ci.yaml below we define for local builds as well
2323
GO_CACHE?=$(shell go env GOCACHE)
2424
GO_MOD_CACHE?=$(shell go env GOMODCACHE)
2525
BUILDTIME_BASE?=$(DOCKER_BUILD_IMAGE)
26-
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
27-
# https://github.com/cloudnativelabs/kube-router/issues/1676
2826
RUNTIME_BASE?=alpine:3.21
2927
DOCKER_LINT_IMAGE?=golangci/golangci-lint:v1.63.4
3028
DOCKER_MARKDOWNLINT_IMAGE?=tmknom/markdownlint:0.39.0

go.mod

+2-2
Original file line numberDiff line numberDiff line change
@@ -127,6 +127,6 @@ require (
127127
sigs.k8s.io/yaml v1.4.0 // indirect
128128
)
129129

130-
go 1.23.0
130+
go 1.24.0
131131

132-
toolchain go1.23.6
132+
toolchain go1.24.1

0 commit comments

Comments
 (0)