Build with go 1.24

This commit is contained in:
Manuel Rüger 2025-03-31 13:30:46 +02:00
parent d8cac914ab
commit 16b48c39a4
3 changed files with 5 additions and 9 deletions

View File

@ -15,11 +15,9 @@ on:
- prep-v[1-9].*
env:
BUILDTIME_BASE: "golang:1.23.6-alpine3.21"
# Do not bump past Alpine 3.18 until upstream netfilter problems in iptables v1.8.10 are resolved. See:
# https://github.com/cloudnativelabs/kube-router/issues/1676
BUILDTIME_BASE: "golang:1.24.1-alpine3.21"
RUNTIME_BASE: "alpine:3.21"
GO_VERSION: "~1.23.6"
GO_VERSION: "~1.24.1"
GO_CACHE: "/home/runner/.cache/go-build"
GO_MOD_CACHE: "/home/runner/go/pkg/mod"

View File

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

4
go.mod
View File

@ -127,6 +127,6 @@ require (
sigs.k8s.io/yaml v1.4.0 // indirect
)
go 1.23.0
go 1.24.0
toolchain go1.23.6
toolchain go1.24.1