Update go modules, fall back to go-1.20:bullseye (#108)

Dockerfile

@@ -1,4 +1,8 @@
-FROM metalstack/builder:latest as builder
+# FIXME this points to the last go-1.20 image of the builder, 
+# go-1.21 cant be used actually because bookworm mangled libsystemd-dev which breaks the build
+# and go-1.21 is not available with bullseye.
+# maybe we should switch away from depending on the builder image
+FROM metalstack/builder@sha256:d2050a3bef9bbd9d9ea769a71a4a70b9ff4b24c537d29d5870b83fc652bb67f8 as builder
 # Install Intel Firmware for e800 based network cards
 ENV ICE_VERSION=1.9.11
 ENV ICE_PKG_VERSION=1.3.30.0
@@ -35,7 +39,7 @@ RUN mkdir -p ${GOPATH}/src/github.com/u-root \
  && GO111MODULE=off go install
 WORKDIR /work
 COPY lvmlocal.conf metal.key metal.key.pub passwd varrun Makefile .git /work/
-COPY --from=r.metal-stack.io/metal/supermicro:2.11.0 /usr/bin/sum /work/
+COPY --from=r.metal-stack.io/metal/supermicro:2.12.0 /usr/bin/sum /work/
 COPY --from=builder /common /common
 COPY --from=builder /work/ice.pkg /work/ice.pkg
 COPY --from=builder /work/bin/metal-hammer /work/bin/

Makefile

@@ -6,6 +6,7 @@ INITRD_COMPRESSED := ${INITRD}.${COMPRESSOR}
 MAINMODULE := .
 COMMONDIR := $(or ${COMMONDIR},../builder)
 CGO_ENABLED := 1
+# export CGO_LDFLAGS := "-lsystemd" "-lpcap" "-ldbus-1"
 
 in-docker: gofmt test all;
 

cmd/storage/filesystem.go

@@ -7,6 +7,7 @@ import (
 	"os/exec"
 	"path"
 	"path/filepath"
+	"golang.org/x/exp/slices"
 	"sort"
 	"strings"
 	"syscall"
@@ -17,7 +18,6 @@ import (
 	"github.com/metal-stack/metal-hammer/pkg/os/command"
 	"github.com/metal-stack/v"
 	"go.uber.org/zap"
-	"golang.org/x/exp/slices"
 )
 
 type Filesystem struct {

go.mod

@@ -1,55 +1,57 @@
 module github.com/metal-stack/metal-hammer
 
-go 1.20
+go 1.21
 
 require (
-	github.com/beevik/ntp v1.1.1
-	github.com/cheggaaa/pb/v3 v3.1.2
+	github.com/beevik/ntp v1.3.0
+	github.com/cheggaaa/pb/v3 v3.1.4
 	github.com/google/gopacket v1.1.19
-	github.com/google/uuid v1.3.0
-	github.com/jaypipes/ghw v0.11.0
-	github.com/metal-stack/go-hal v0.4.3
-	github.com/metal-stack/go-lldpd v0.4.3
-	github.com/metal-stack/metal-api v0.22.6
-	github.com/metal-stack/metal-go v0.22.6
-	github.com/metal-stack/pixie v0.2.2
+	github.com/google/uuid v1.4.0
+	github.com/jaypipes/ghw v0.12.0
+	github.com/metal-stack/go-hal v0.4.4
+	github.com/metal-stack/go-lldpd v0.4.4
+	github.com/metal-stack/metal-api v0.24.5
+	github.com/metal-stack/metal-go v0.24.5
+	github.com/metal-stack/pixie v0.2.5
 	github.com/metal-stack/v v1.0.3
 	// archiver must stay in version v2.1.0, see replace below
 	github.com/mholt/archiver v3.1.1+incompatible
 	github.com/pierrec/lz4/v4 v4.1.18
 	github.com/u-root/u-root v0.11.0
 	github.com/vishvananda/netlink v1.2.1-beta.2
-	go.uber.org/zap v1.24.0
-	golang.org/x/exp v0.0.0-20230626212559-97b1e661b5df
-	golang.org/x/sync v0.3.0
-	golang.org/x/sys v0.9.0
-	google.golang.org/grpc v1.56.1
+	go.uber.org/zap v1.26.0
+	// TODO remove once we really migrated the build to 1.21
+	golang.org/x/exp v0.0.0-20231108232855-2478ac86f678
+	golang.org/x/sync v0.5.0
+	golang.org/x/sys v0.14.0
+	google.golang.org/grpc v1.59.0
 	google.golang.org/protobuf v1.31.0
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+replace github.com/mholt/archiver => github.com/mholt/archiver v2.1.0+incompatible
+
 require (
 	github.com/StackExchange/wmi v1.2.1 // indirect
 	github.com/VividCortex/ewma v1.2.0 // indirect
 	github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be // indirect
 	github.com/asaskevich/govalidator v0.0.0-20230301143203-a9d515a09cc2 // indirect
-	github.com/avast/retry-go/v4 v4.3.4 // indirect
-	github.com/benbjohnson/clock v1.3.5 // indirect
+	github.com/avast/retry-go/v4 v4.5.0 // indirect
 	github.com/coreos/go-oidc/v3 v3.6.0 // indirect
-	github.com/creack/pty v1.1.18 // indirect
+	github.com/creack/pty v1.1.20 // indirect
 	github.com/decred/dcrd/dcrec/secp256k1/v4 v4.2.0 // indirect
 	github.com/dsnet/compress v0.0.1 // indirect
-	github.com/fatih/color v1.15.0 // indirect
-	github.com/frankban/quicktest v1.14.5 // indirect
+	github.com/fatih/color v1.16.0 // indirect
+	github.com/frankban/quicktest v1.14.6 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/gliderlabs/ssh v0.3.5 // indirect
 	github.com/go-jose/go-jose/v3 v3.0.0 // indirect
 	github.com/go-logr/logr v1.2.4 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-ole/go-ole v1.2.6 // indirect
+	github.com/go-ole/go-ole v1.3.0 // indirect
 	github.com/go-openapi/analysis v0.21.4 // indirect
 	github.com/go-openapi/errors v0.20.4 // indirect
-	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonpointer v0.20.0 // indirect
 	github.com/go-openapi/jsonreference v0.20.2 // indirect
 	github.com/go-openapi/loads v0.21.2 // indirect
 	github.com/go-openapi/runtime v0.26.0 // indirect
@@ -61,23 +63,23 @@ require (
 	github.com/golang-jwt/jwt/v4 v4.5.0 // indirect
 	github.com/golang/protobuf v1.5.3 // indirect
 	github.com/golang/snappy v0.0.4 // indirect
-	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/jaypipes/pcidb v1.0.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/lestrrat-go/backoff/v2 v2.0.8 // indirect
-	github.com/lestrrat-go/blackmagic v1.0.1 // indirect
+	github.com/lestrrat-go/blackmagic v1.0.2 // indirect
 	github.com/lestrrat-go/httpcc v1.0.1 // indirect
 	github.com/lestrrat-go/iter v1.0.2 // indirect
 	github.com/lestrrat-go/jwx v1.2.26 // indirect
 	github.com/lestrrat-go/option v1.0.1 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
-	github.com/mattn/go-isatty v0.0.19 // indirect
-	github.com/mattn/go-runewidth v0.0.14 // indirect
+	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mdlayher/ethernet v0.0.0-20220221185849-529eae5b6118 // indirect
 	github.com/mdlayher/lldp v0.0.0-20150915211757-afd9f83164c5 // indirect
-	github.com/metal-stack/metal-lib v0.12.2 // indirect
-	github.com/metal-stack/security v0.6.6 // indirect
+	github.com/metal-stack/metal-lib v0.13.5 // indirect
+	github.com/metal-stack/security v0.6.7 // indirect
 	github.com/mitchellh/go-homedir v1.1.0 // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nwaples/rardecode v1.1.3 // indirect
@@ -91,21 +93,17 @@ require (
 	github.com/ulikunitz/xz v0.5.11 // indirect
 	github.com/vishvananda/netns v0.0.4 // indirect
 	github.com/vmware/goipmi v0.0.0-20181114221114-2333cd82d702 // indirect
-	go.mongodb.org/mongo-driver v1.12.0 // indirect
+	go.mongodb.org/mongo-driver v1.12.1 // indirect
 	go.opentelemetry.io/otel v1.16.0 // indirect
 	go.opentelemetry.io/otel/metric v1.16.0 // indirect
 	go.opentelemetry.io/otel/trace v1.16.0 // indirect
-	go.uber.org/atomic v1.11.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.10.0 // indirect
-	golang.org/x/net v0.11.0 // indirect
-	golang.org/x/oauth2 v0.9.0 // indirect
-	golang.org/x/text v0.10.0 // indirect
-	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20230526203410-71b5a4ffd15e // indirect
-	gopkg.in/square/go-jose.v2 v2.6.0 // indirect
+	golang.org/x/crypto v0.15.0 // indirect
+	golang.org/x/net v0.18.0 // indirect
+	golang.org/x/oauth2 v0.14.0 // indirect
+	golang.org/x/text v0.14.0 // indirect
+	google.golang.org/appengine v1.6.8 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20231106174013-bbf56f31fb17 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	howett.net/plist v1.0.0 // indirect
 )
-
-replace github.com/mholt/archiver => github.com/mholt/archiver v2.1.0+incompatible