Skip to content

Commit 1d4f470

Browse files
authored
Update to go-1.26 and fix intel firmware download (#178)
1 parent 3dcc51c commit 1d4f470

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

Dockerfile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.25-alpine AS builder
1+
FROM golang:1.26-alpine AS builder
22

33
RUN apk add \
44
binutils \
@@ -13,9 +13,9 @@ WORKDIR /work
1313
COPY . .
1414
RUN make all
1515
# Install Intel Firmware for e800 based network cards
16-
ENV ICE_VERSION=1.14.13
17-
ENV ICE_PKG_VERSION=1.3.36.0
18-
RUN curl -fLsS https://sourceforge.net/projects/e1000/files/ice%20stable/${ICE_VERSION}/ice-${ICE_VERSION}.tar.gz/download -o ice.tar.gz \
16+
ENV ICE_VERSION=2.4.5
17+
ENV ICE_PKG_VERSION=1.3.53.0
18+
RUN curl -fLsS https://github.com/intel/ethernet-linux-ice/releases/download/v${ICE_VERSION}/ice-${ICE_VERSION}.tar.gz -o ice.tar.gz \
1919
&& tar -xf ice.tar.gz ice-${ICE_VERSION}/ddp/ice-${ICE_PKG_VERSION}.pkg \
2020
&& mkdir -p /lib/firmware/intel/ice/ddp/ \
2121
&& mv ice-${ICE_VERSION}/ddp/ice-${ICE_PKG_VERSION}.pkg /work/ice.pkg

cmd/install_test.go

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,27 +18,27 @@ func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
1818
{
1919
name: "4 interfaces, two with neighbors",
2020
nics: []*models.V1MachineNic{
21-
{Name: ptr("eth0")},
22-
{Name: ptr("eth1")},
23-
{Name: ptr("eth2"), Mac: ptr("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp1"), Mac: ptr("cc:dd")}}},
24-
{Name: ptr("eth3"), Mac: ptr("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp2"), Mac: ptr("cc:de")}}},
21+
{Name: new("eth0")},
22+
{Name: new("eth1")},
23+
{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
24+
{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
2525
},
2626
want: []*models.V1MachineNic{
27-
{Name: ptr("eth2"), Mac: ptr("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp1"), Mac: ptr("cc:dd")}}},
28-
{Name: ptr("eth3"), Mac: ptr("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp2"), Mac: ptr("cc:de")}}},
27+
{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
28+
{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
2929
},
3030
},
3131
{
3232
name: "4 interfaces, two with neighbors, one with empty Mac",
3333
nics: []*models.V1MachineNic{
34-
{Name: ptr("eth0")},
35-
{Name: ptr("eth1"), Mac: ptr("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp1")}}},
36-
{Name: ptr("eth2"), Mac: ptr("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp1"), Mac: ptr("cc:dd")}}},
37-
{Name: ptr("eth3"), Mac: ptr("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp2"), Mac: ptr("cc:de")}}},
34+
{Name: new("eth0")},
35+
{Name: new("eth1"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1")}}},
36+
{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
37+
{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
3838
},
3939
want: []*models.V1MachineNic{
40-
{Name: ptr("eth2"), Mac: ptr("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp1"), Mac: ptr("cc:dd")}}},
41-
{Name: ptr("eth3"), Mac: ptr("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: ptr("swp2"), Mac: ptr("cc:de")}}},
40+
{Name: new("eth2"), Mac: new("aa:bb"), Neighbors: []*models.V1MachineNic{{Name: new("swp1"), Mac: new("cc:dd")}}},
41+
{Name: new("eth3"), Mac: new("aa:bc"), Neighbors: []*models.V1MachineNic{{Name: new("swp2"), Mac: new("cc:de")}}},
4242
},
4343
},
4444
}
@@ -53,7 +53,3 @@ func TestHammer_onlyNicsWithNeighbors(t *testing.T) {
5353
})
5454
}
5555
}
56-
57-
func ptr(s string) *string {
58-
return &s
59-
}

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/metal-stack/metal-hammer
22

3-
go 1.25.0
3+
go 1.26
44

55
require (
66
github.com/beevik/ntp v1.5.0

0 commit comments

Comments
 (0)