Skip to content

Commit 6bb2025

Browse files
Merge pull request #2718 from Nordix/uplift-go-version
🌱Uplift go 1.24.9 to address CVEs
2 parents d88604a + ffa977e commit 6bb2025

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Support FROM override
2-
ARG BUILD_IMAGE=docker.io/golang:1.24.7@sha256:5e9d14d681c3224276f0c8e318525ef6fc96b47fbcbb89f8bec0e402e18ea8bf
2+
ARG BUILD_IMAGE=docker.io/golang:1.24.9@sha256:02ce1d7ea7825dccb7cd10222e44e7c0565a08c5a38795e50fbf43936484507b
33
ARG BASE_IMAGE=gcr.io/distroless/static:nonroot@sha256:9ecc53c269509f63c69a266168e4a687c7eb8c0cfd753bd8bfcaa4f58a90876f
44

55
# Build the manager binary

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ GO_TEST_FLAGS = $(TEST_FLAGS)
44
DEBUG = --debug
55
COVER_PROFILE = cover.out
66
GO := $(shell type -P go)
7-
GO_VERSION ?= 1.24.7
7+
GO_VERSION ?= 1.24.9
88

99
ROOT_DIR := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST))))
1010

hack/e2e/ensure_go.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -eux
44

5-
MINIMUM_GO_VERSION=go1.24.7
5+
MINIMUM_GO_VERSION=go1.24.9
66

77
# Ensure the go tool exists and is a viable version, or installs it
88
verify_go_version()

internal/webhooks/metal3.io/v1alpha1/baremetalhost_validation_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ func TestValidateCreate(t *testing.T) {
458458
BMC: metal3api.BMCDetails{
459459
Address: "ipmi://[fe80::fc33:62ff:fe33:8xff]:6223"}}},
460460
oldBMH: nil,
461-
wantedErr: "failed to parse BMC address information: BMC address hostname/IP : [fe80::fc33:62ff:fe33:8xff] is invalid",
461+
wantedErr: "failed to parse BMC address information: parse \"ipmi://[fe80::fc33:62ff:fe33:8xff]:6223\": invalid host: ParseAddr(\"fe80::fc33:62ff:fe33:8xff\"): unexpected character, want colon (at \"xff\")",
462462
},
463463
{
464464
name: "validRootDeviceHint",

0 commit comments

Comments
 (0)