Merge branch 'talos-1.5'

Dockerfile

@@ -1,8 +1,9 @@
-FROM golang:1.17.8-alpine AS builder
+FROM golang:1.21.0-alpine AS builder
 WORKDIR /build
 COPY . .
+ARG TARGETARCH
 ARG CGO_ENABLED=0
-ARG GOARCH=amd64
+ARG GOARCH=$TARGETARCH
 ARG GOOS=linux
 RUN go test -v ./... && \
     go vet ./... && \

Makefile

@@ -1,4 +1,7 @@
+# For development only.
+# This Makefile is not being used by Dockerfile.
+
 talos-vmtoolsd:
-	GOOS=linux GOARCH=amd64 go build -ldflags="-s -w" -trimpath -o $@ ./cmd/$@
+	go build -ldflags="-s -w" -trimpath -o $@ ./cmd/$@
 
 .PHONY: talos-vmtoolsd

README.md

@@ -33,10 +33,11 @@ kubectl apply -f https://raw.githubusercontent.com/mologie/talos-vmtoolsd/releas
 
 # Talos Compatibility Matrix
 
-| ⬇️ Tools \ Talos ➡️ | 0.7 - 0.10 | 0.11 - 0.13 | 0.14+ |
-| ----------------- | ---------- | ----------- | ----- |
-| **0.3** (current) |  ❌         | ✅          | ✅    |
-| **0.2**           |  ✅         | ✅          | ❌    |
+| ⬇️ Tools \ Talos ➡️ | 0.7 - 0.10 | 0.11 - 0.13 | 0.14 - 1.4 | 1.4 | 1.5+ |
+| ----------------- | ---------- | ----------- | ---------- | --- | ---- |
+| **0.4** (current) |  ❌         | ❌           | ❌        | ✅   | ✅    |
+| **0.3**           |  ❌         | ✅           | ✅        | ✅   | ❌    |
+| **0.2**           |  ✅         | ✅           | ❌        | ❌   | ❌    |
 
 # Roadmap
 

go.mod

@@ -1,54 +1,58 @@
 module github.com/mologie/talos-vmtoolsd
 
-go 1.17
+go 1.21.0
 
 require (
-	github.com/golang/protobuf v1.5.2
-	github.com/sirupsen/logrus v1.8.1
+	github.com/cosi-project/runtime v0.3.6
+	github.com/golang/protobuf v1.5.3
+	github.com/siderolabs/talos/pkg/machinery v1.5.1
+	github.com/sirupsen/logrus v1.9.3
 	github.com/stellar/go-xdr v0.0.0-20211103144802-8017fc4bdfee
-	github.com/talos-systems/talos v0.13.0
-	github.com/talos-systems/talos/pkg/machinery v0.14.0
-	github.com/vmware/govmomi v0.27.2
-	github.com/vmware/vmw-guestinfo v0.0.0-20211006225857-cc1fd90d572c
-	gopkg.in/yaml.v2 v2.4.0
-	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
+	github.com/vmware/govmomi v0.30.7
+	github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3
 )
 
 require (
-	github.com/AlekSi/pointer v1.2.0 // indirect
-	github.com/BurntSushi/toml v0.4.1 // indirect
-	github.com/containerd/go-cni v1.1.1 // indirect
-	github.com/containernetworking/cni v1.0.1 // indirect
-	github.com/cosi-project/runtime v0.0.0-20211216175730-264f8fcd1a4f // indirect
-	github.com/gertd/go-pluralize v0.1.7 // indirect
-	github.com/google/go-cmp v0.5.6 // indirect
+	github.com/ProtonMail/go-crypto v0.0.0-20230717121422-5aa5874ade95 // indirect
+	github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
+	github.com/ProtonMail/gopenpgp/v2 v2.7.3 // indirect
+	github.com/adrg/xdg v0.4.0 // indirect
+	github.com/cloudflare/circl v1.3.3 // indirect
+	github.com/containerd/go-cni v1.1.9 // indirect
+	github.com/containernetworking/cni v1.1.2 // indirect
+	github.com/dustin/go-humanize v1.0.1 // indirect
+	github.com/gertd/go-pluralize v0.2.1 // indirect
+	github.com/google/go-cmp v0.5.9 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.17.1 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-multierror v1.1.1 // indirect
-	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
-	github.com/jsimonetti/rtnetlink v0.0.0-20211213041634-9dff439f7e79 // indirect
-	github.com/mdlayher/ethtool v0.0.0-20211214014908-bc8fdcf6e99c // indirect
-	github.com/mdlayher/genetlink v1.1.0 // indirect
-	github.com/mdlayher/netlink v1.5.0 // indirect
-	github.com/mdlayher/socket v0.1.1 // indirect
-	github.com/onsi/gomega v1.10.3 // indirect
-	github.com/stretchr/objx v0.2.0 // indirect
-	github.com/talos-systems/crypto v0.3.4 // indirect
-	github.com/talos-systems/net v0.3.1 // indirect
-	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
-	golang.org/x/crypto v0.0.0-20211215153901-e495a2d5b3d3 // indirect
-	golang.org/x/mod v0.5.1 // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
-	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/tools v0.1.8 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20211215182854-7a385b3431de // indirect
-	google.golang.org/genproto v0.0.0-20211221231510-d629cc9a93d5 // indirect
-	google.golang.org/grpc v1.43.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
-	gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	honnef.co/go/tools v0.2.2 // indirect
+	github.com/josharian/native v1.1.0 // indirect
+	github.com/jsimonetti/rtnetlink v1.3.4 // indirect
+	github.com/mdlayher/ethtool v0.1.0 // indirect
+	github.com/mdlayher/genetlink v1.3.2 // indirect
+	github.com/mdlayher/netlink v1.7.2 // indirect
+	github.com/mdlayher/socket v0.4.1 // indirect
+	github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
+	github.com/pkg/browser v0.0.0-20210911075715-681adbf594b8 // indirect
+	github.com/pkg/errors v0.9.1 // indirect
+	github.com/ryanuber/go-glob v1.0.0 // indirect
+	github.com/siderolabs/crypto v0.4.1 // indirect
+	github.com/siderolabs/gen v0.4.6 // indirect
+	github.com/siderolabs/go-api-signature v0.2.6 // indirect
+	github.com/siderolabs/go-blockdevice v0.4.6 // indirect
+	github.com/siderolabs/go-pointer v1.0.0 // indirect
+	github.com/siderolabs/net v0.4.0 // indirect
+	github.com/siderolabs/protoenc v0.2.0 // indirect
+	go.uber.org/multierr v1.10.0 // indirect
+	go.uber.org/zap v1.25.0 // indirect
+	golang.org/x/crypto v0.12.0 // indirect
+	golang.org/x/net v0.14.0 // indirect
+	golang.org/x/sync v0.3.0 // indirect
+	golang.org/x/sys v0.11.0 // indirect
+	golang.org/x/text v0.12.0 // indirect
+	google.golang.org/genproto/googleapis/api v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect
+	google.golang.org/grpc v1.57.0 // indirect
+	google.golang.org/protobuf v1.31.0 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
 )