Skip to content

Commit 0beb715

Browse files
authored
Merge pull request #2278 from marquiz/devel/golang
Bump golang to v1.25
2 parents 0240ee3 + 069deef commit 0beb715

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IMAGE_BUILD_CMD ?= docker build
88
IMAGE_BUILD_EXTRA_OPTS ?=
99
IMAGE_PUSH_CMD ?= docker push
1010
CONTAINER_RUN_CMD ?= docker run
11-
BUILDER_IMAGE ?= golang:1.24-bookworm
11+
BUILDER_IMAGE ?= golang:1.25-trixie
1212
BASE_IMAGE_FULL ?= debian:bookworm-slim
1313
BASE_IMAGE_MINIMAL ?= scratch
1414

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ allow_k8s_contexts('kubernetes-admin@kubernetes')
66

77
BASE_IMAGE_MINIMAL="gcr.io/distroless/base"
88
BASE_IMAGE_FULL="debian:bullseye-slim"
9-
BUILDER_IMAGE="golang:1.24-bookworm"
9+
BUILDER_IMAGE="golang:1.25-trixie"
1010
HOSTMOUNT_PREFIX="/host-"
1111
IMAGE_TAG_NAME = os.getenv('IMAGE_TAG_NAME', "master")
1212
IMAGE_REGISTRY = os.getenv('IMAGE_REGISTRY', "gcr.io/k8s-staging-nfd")

go.mod

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module sigs.k8s.io/node-feature-discovery
22

3-
go 1.24.0
4-
5-
toolchain go1.24.2
3+
go 1.25.0
64

75
require (
86
github.com/Masterminds/semver/v3 v3.4.0

0 commit comments

Comments
 (0)