From 951904554ee8a464794cc2f9a9fb6bc084791c06 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Thu, 4 Apr 2024 14:59:24 +0400 Subject: [PATCH] chore: bump dependencies (go 1.22.2) Update Go to 1.22.2, update Go modules to resolve [HTTP/2 issue](https://www.kb.cert.org/vuls/id/421644). Signed-off-by: Andrey Smirnov --- Makefile | 10 +++--- cmd/talosctl/cmd/talos/disks.go | 2 +- cmd/talosctl/cmd/talos/etcd.go | 2 +- cmd/talosctl/cmd/talos/logs.go | 2 +- go.mod | 16 +++++----- go.sum | 32 +++++++++---------- go.work | 2 +- hack/cloud-image-uploader/go.mod | 6 ++-- hack/cloud-image-uploader/go.sum | 8 ++--- hack/docgen/go.mod | 2 +- hack/gotagsrewrite/go.mod | 2 +- hack/module-sig-verify/go.mod | 2 +- hack/release.toml | 4 +-- hack/structprotogen/go.mod | 2 +- internal/app/apid/main.go | 2 +- internal/app/apid/pkg/backend/apid.go | 3 +- .../server/v1alpha1/v1alpha1_time_test.go | 4 +-- .../controllers/network/operator_spec_test.go | 2 +- .../pkg/controllers/runtime/events_sink.go | 3 +- .../pkg/controllers/runtime/machine_status.go | 2 +- .../pkg/controllers/siderolink/manager.go | 6 +--- .../runner/containerd/containerd_test.go | 1 - internal/app/trustd/main.go | 2 +- internal/pkg/cri/client.go | 2 +- internal/pkg/encryption/keys/kms.go | 9 +++--- internal/pkg/extensions/validate.go | 2 +- pkg/grpc/middleware/auth/basic/basic.go | 2 +- pkg/grpc/proxy/backend/local.go | 3 +- pkg/machinery/client/client.go | 2 +- pkg/machinery/client/connection.go | 13 ++++---- .../types/v1alpha1/v1alpha1_validation.go | 2 +- pkg/machinery/constants/constants.go | 6 ++-- pkg/machinery/gendata/data/extras | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- pkg/machinery/go.mod | 9 +++--- pkg/machinery/go.sum | 18 +++++------ 36 files changed, 87 insertions(+), 102 deletions(-) diff --git a/Makefile b/Makefile index b0837762d..20141833b 100644 --- a/Makefile +++ b/Makefile @@ -15,11 +15,11 @@ NAME = Talos CLOUD_IMAGES_EXTRA_ARGS ?= "" ARTIFACTS := _out -TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0 +TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-1-g10b2a69 PKGS_PREFIX ?= ghcr.io/siderolabs -PKGS ?= v1.7.0-1-gd57b0ad -EXTRAS ?= v1.7.0 +PKGS ?= v1.7.0-2-g6101299 +EXTRAS ?= v1.7.0-1-gbb76755 PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS) PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS) @@ -55,13 +55,13 @@ GOIMPORTS_VERSION ?= v0.19.0 # renovate: datasource=go depName=mvdan.cc/gofumpt GOFUMPT_VERSION ?= v0.6.0 # renovate: datasource=go depName=github.com/golangci/golangci-lint -GOLANGCILINT_VERSION ?= v1.57.0 +GOLANGCILINT_VERSION ?= v1.57.2 # renovate: datasource=go depName=golang.org/x/tools STRINGER_VERSION ?= v0.19.0 # renovate: datasource=go depName=github.com/dmarkham/enumer ENUMER_VERSION ?= v1.5.9 # renovate: datasource=go depName=k8s.io/code-generator -DEEPCOPY_GEN_VERSION ?= v0.29.2 +DEEPCOPY_GEN_VERSION ?= v0.29.3 # renovate: datasource=go depName=github.com/planetscale/vtprotobuf VTPROTOBUF_VERSION ?= v0.6.0 # renovate: datasource=go depName=github.com/siderolabs/deep-copy diff --git a/cmd/talosctl/cmd/talos/disks.go b/cmd/talosctl/cmd/talos/disks.go index 298f0d4b3..45d3ba3d0 100644 --- a/cmd/talosctl/cmd/talos/disks.go +++ b/cmd/talosctl/cmd/talos/disks.go @@ -86,7 +86,7 @@ func printDisks(ctx context.Context, c *client.Client) error { for j, disk := range message.Disks { if i == 0 && j == 0 { if node != "" { - fmt.Fprintln(w, "NODE\t"+labels) //nolint:goconst + fmt.Fprintln(w, "NODE\t"+labels) } else { fmt.Fprintln(w, labels) } diff --git a/cmd/talosctl/cmd/talos/etcd.go b/cmd/talosctl/cmd/talos/etcd.go index 0abf790dd..021b77f7a 100644 --- a/cmd/talosctl/cmd/talos/etcd.go +++ b/cmd/talosctl/cmd/talos/etcd.go @@ -61,7 +61,7 @@ func displayAlarms(messages []alarmMessage) error { if i == 0 && j == 0 { if node != "" { header = "NODE\t" + header - pattern = "%s\t" + pattern //nolint:goconst + pattern = "%s\t" + pattern } fmt.Fprintln(w, header) diff --git a/cmd/talosctl/cmd/talos/logs.go b/cmd/talosctl/cmd/talos/logs.go index ccea9de65..bde8602e1 100644 --- a/cmd/talosctl/cmd/talos/logs.go +++ b/cmd/talosctl/cmd/talos/logs.go @@ -85,7 +85,7 @@ var logsCmd = &cobra.Command{ continue } - node := defaultNode //nolint:copyloopvar + node := defaultNode if data.Metadata != nil && data.Metadata.Hostname != "" { node = data.Metadata.Hostname } diff --git a/go.mod b/go.mod index 4e2386dad..4592e96f6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos -go 1.22.1 +go 1.22.2 replace ( // forked coredns so we don't carry caddy and other stuff into the Talos @@ -60,7 +60,7 @@ require ( github.com/containernetworking/plugins v1.4.1 github.com/coredns/coredns v1.11.2 github.com/coreos/go-iptables v0.7.0 - github.com/cosi-project/runtime v0.4.0-alpha.9 + github.com/cosi-project/runtime v0.4.0 github.com/distribution/reference v0.6.0 github.com/docker/docker v26.0.0+incompatible github.com/docker/go-connections v0.5.0 @@ -113,7 +113,7 @@ require ( github.com/pin/tftp/v3 v3.1.0 github.com/pmorjan/kmod v1.1.1 github.com/prometheus/procfs v0.13.0 - github.com/rivo/tview v0.0.0-20240402201323-fec4f00cf099 + github.com/rivo/tview v0.0.0-20240403142647-a22293bda944 github.com/rs/xid v1.5.0 github.com/ryanuber/columnize v2.1.2+incompatible github.com/ryanuber/go-glob v1.0.0 @@ -150,7 +150,7 @@ require ( github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.9.0 github.com/u-root/u-root v0.14.0 - github.com/ulikunitz/xz v0.5.11 + github.com/ulikunitz/xz v0.5.12 github.com/vishvananda/netlink v1.2.1-beta.2 github.com/vmware-tanzu/sonobuoy v0.57.1 github.com/vmware/vmw-guestinfo v0.0.0-20220317130741-510905f0efa3 @@ -161,7 +161,7 @@ require ( go.etcd.io/etcd/etcdutl/v3 v3.5.13 go.uber.org/zap v1.27.0 go4.org/netipx v0.0.0-20231129151722-fdeea329fbba - golang.org/x/net v0.22.0 + golang.org/x/net v0.23.0 golang.org/x/oauth2 v0.18.0 golang.org/x/sync v0.6.0 golang.org/x/sys v0.18.0 @@ -169,7 +169,7 @@ require ( golang.org/x/text v0.14.0 golang.org/x/time v0.5.0 golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6 - google.golang.org/grpc v1.62.1 + google.golang.org/grpc v1.63.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 k8s.io/klog/v2 v2.120.1 @@ -178,7 +178,7 @@ require ( ) require ( - cloud.google.com/go/compute v1.23.4 // indirect + cloud.google.com/go/compute v1.24.0 // indirect github.com/0x5a17ed/itkit v0.6.0 // indirect github.com/AdaLogics/go-fuzz-headers v0.0.0-20230811130428-ced1acdcaa24 // indirect github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20230306123547-8075edf89bb0 // indirect @@ -347,7 +347,7 @@ require ( golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect google.golang.org/appengine v1.6.8 // indirect - google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 // indirect + google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda // indirect gopkg.in/inf.v0 v0.9.1 // indirect diff --git a/go.sum b/go.sum index 9ba98375f..c920d9ee9 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ cloud.google.com/go/bigquery v1.4.0/go.mod h1:S8dzgnTigyfTmLBfrtrhyYhwRxG72rYxvf cloud.google.com/go/bigquery v1.5.0/go.mod h1:snEHRnqQbz117VIFhE8bmtwIDY80NLUZUMb4Nv6dBIg= cloud.google.com/go/bigquery v1.7.0/go.mod h1://okPTzCYNXSlb24MZs83e2Do+h+VXtc4gLoIoXIAPc= cloud.google.com/go/bigquery v1.8.0/go.mod h1:J5hqkt3O0uAFnINi6JXValWIb1v0goeZM77hZzJN/fQ= -cloud.google.com/go/compute v1.23.4 h1:EBT9Nw4q3zyE7G45Wvv3MzolIrCJEuHys5muLY0wvAw= -cloud.google.com/go/compute v1.23.4/go.mod h1:/EJMj55asU6kAFnuZET8zqgwgJ9FvXWXOkkfQZa4ioI= +cloud.google.com/go/compute v1.24.0 h1:phWcR2eWzRJaL/kOiJwfFsPs4BaKq1j6vnpZrc1YlVg= +cloud.google.com/go/compute v1.24.0/go.mod h1:kw1/T+h/+tK2LJK0wiPPx1intgdAM3j/g3hFDlscY40= cloud.google.com/go/compute/metadata v0.2.3 h1:mg4jlk7mCAj6xXp9UJ4fjI9VUI5rubuGBW5aJ7UnBMY= cloud.google.com/go/compute/metadata v0.2.3/go.mod h1:VAV5nSsACxMJvgaAuX6Pk2AawlZn8kiOGuCv6gTkwuA= cloud.google.com/go/datastore v1.0.0/go.mod h1:LXYbyblFSglQ5pkeyhO+Qmw7ukd3C+pD7TKLgZqpHYE= @@ -189,8 +189,8 @@ github.com/coreos/go-semver v0.3.1 h1:yi21YpKnrx1gt5R+la8n5WgS0kCrsPp33dmEyHReZr github.com/coreos/go-semver v0.3.1/go.mod h1:irMmmIw/7yzSRPWryHsK7EYSg09caPQL03VsM8rvUec= github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8iXXhfZs= github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= -github.com/cosi-project/runtime v0.4.0-alpha.9 h1:c4PLjpZW19TYk7Y++gXDOpD+sM0YFSsr189p49/EHMY= -github.com/cosi-project/runtime v0.4.0-alpha.9/go.mod h1:Was5rgpxPSJfNqbw01atuWHer5KYMtzhwJm02+xbU90= +github.com/cosi-project/runtime v0.4.0 h1:sK4UYOvafWzb0/doZf3wl/Pob2lZD3DgZTo7tzGW/Lw= +github.com/cosi-project/runtime v0.4.0/go.mod h1:DOeuuUaUE1c5c4biqkDZWTfCJl6BdYtxuOzvRVOoRV8= github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/cpuguy83/go-md2man/v2 v2.0.3 h1:qMCsGGgs+MAzDFyp9LpAe1Lqy/fY/qCovCm0qnXZOBM= github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= @@ -627,15 +627,15 @@ github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGK github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5 h1:mZHayPoR0lNmnHyvtYjDeq0zlVHn9K/ZXoy17ylucdo= github.com/rifflock/lfshook v0.0.0-20180920164130-b9218ef580f5/go.mod h1:GEXHk5HgEKCvEIIrSpFI3ozzG5xOKA2DVlEX/gGnewM= -github.com/rivo/tview v0.0.0-20240402201323-fec4f00cf099 h1:SiT8fIhxz3qRtCi1Yd+vkW0N+LlDMGzB02Fk6e2vQG8= -github.com/rivo/tview v0.0.0-20240402201323-fec4f00cf099/go.mod h1:02iFIz7K/A9jGCvrizLPvoqr4cEIx7q54RH5Qudkrss= +github.com/rivo/tview v0.0.0-20240403142647-a22293bda944 h1:mtRO4FDhPX7UzxxhaO4Rsw3UKNj1NT6lRhGpw4hPPW8= +github.com/rivo/tview v0.0.0-20240403142647-a22293bda944/go.mod h1:02iFIz7K/A9jGCvrizLPvoqr4cEIx7q54RH5Qudkrss= github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.3/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M= -github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/rs/xid v1.5.0 h1:mKX4bl4iPYJtEIxp6CYiUuLQ/8DYMoz0PUdtGgMFRVc= github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -757,8 +757,8 @@ github.com/u-root/u-root v0.14.0 h1:Ka4T10EEML7dQ5XDvO9c3MBN8z4nuSnGjcd1jmU2ivg= github.com/u-root/u-root v0.14.0/go.mod h1:hAyZorapJe4qzbLWlAkmSVCJGbfoU9Pu4jpJ1WMluqE= github.com/u-root/uio v0.0.0-20240209044354-b3d14b93376a h1:BH1SOPEvehD2kVrndDnGJiUF0TrBpNs+iyYocu6h0og= github.com/u-root/uio v0.0.0-20240209044354-b3d14b93376a/go.mod h1:P3a5rG4X7tI17Nn3aOIAYr5HbIMukwXG0urG0WuL8OA= -github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= -github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= +github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/unix4ever/yaml v0.0.0-20220527175918-f17b0f05cf2c h1:Vn6nVVu9MdOYvXPkJP83iX5jVIfvxFC9v9xIKb+DlaQ= github.com/unix4ever/yaml v0.0.0-20220527175918-f17b0f05cf2c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= github.com/urfave/cli v1.22.12/go.mod h1:sSBEIC79qR6OvcmsD4U3KABeOTxDqQtdDnaFuUN30b8= @@ -939,8 +939,8 @@ golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= golang.org/x/net v0.10.0/go.mod h1:0qNGK6F8kojg2nk9dLZ2mShWaEBan6FAoqfSigmmuDg= golang.org/x/net v0.15.0/go.mod h1:idbUs1IY1+zTqbi8yxTbhexhEEk5ur9LInksu6HrEpk= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw= @@ -1193,8 +1193,8 @@ google.golang.org/genproto v0.0.0-20201210142538-e3217bee35cc/go.mod h1:FWY/as6D google.golang.org/genproto v0.0.0-20201214200347-8c77b98c765d/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210108203827-ffc7fda8c3d7/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= google.golang.org/genproto v0.0.0-20210226172003-ab064af71705/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014 h1:g/4bk7P6TPMkAUbUhquq98xey1slwvuVJPosdBqYJlU= -google.golang.org/genproto v0.0.0-20240205150955-31a09d347014/go.mod h1:xEgQu1e4stdSSsxPDK8Azkrk/ECl5HvdPf6nbZrTS5M= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de h1:F6qOa9AZTYJXOUEr4jDysRDLrm4PHePlge4v4TGAlxY= +google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de/go.mod h1:VUhTRKeHn9wwcdrk73nvdC9gF178Tzhmt/qyaFcPLSo= google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda h1:b6F6WIV4xHHD0FA4oIyzU6mHWg2WI2X1RBehwa5QN38= google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda/go.mod h1:AHcE/gZH76Bk/ROZhQphlRoWo5xKDEtz3eVEO1LfA8c= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= @@ -1215,8 +1215,8 @@ google.golang.org/grpc v1.31.1/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM google.golang.org/grpc v1.33.2/go.mod h1:JMHMWHQWaTccqQQlmk3MJZS+GWXOdAesneDmEnv2fbc= google.golang.org/grpc v1.34.0/go.mod h1:WotjhfgOW/POjDeRt8vscBtXq+2VjORFy659qA51WJ8= google.golang.org/grpc v1.35.0/go.mod h1:qjiiYl8FncCW8feJPdyg3v6XW24KsRHe+dy9BAGRRjU= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= +google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM= diff --git a/go.work b/go.work index 4d51a94b2..1074f7d79 100644 --- a/go.work +++ b/go.work @@ -1,4 +1,4 @@ -go 1.22.1 +go 1.22.2 use ( . diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod index 57778813a..d06bf85f3 100644 --- a/hack/cloud-image-uploader/go.mod +++ b/hack/cloud-image-uploader/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/cloud-image-uploader -go 1.22.1 +go 1.22.2 require ( github.com/Azure/azure-sdk-for-go v68.0.0+incompatible @@ -11,13 +11,13 @@ require ( github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v1.3.1 github.com/Azure/go-autorest/autorest v0.11.29 github.com/Azure/go-autorest/autorest/azure/auth v0.5.12 - github.com/aws/aws-sdk-go v1.51.13 + github.com/aws/aws-sdk-go v1.51.14 github.com/blang/semver/v4 v4.0.0 github.com/google/uuid v1.6.0 github.com/siderolabs/gen v0.4.8 github.com/siderolabs/go-retry v0.3.3 github.com/spf13/pflag v1.0.5 - github.com/ulikunitz/xz v0.5.11 + github.com/ulikunitz/xz v0.5.12 golang.org/x/sync v0.6.0 ) diff --git a/hack/cloud-image-uploader/go.sum b/hack/cloud-image-uploader/go.sum index 53e4f8789..57d6b76db 100644 --- a/hack/cloud-image-uploader/go.sum +++ b/hack/cloud-image-uploader/go.sum @@ -45,8 +45,8 @@ github.com/Azure/go-autorest/tracing v0.6.0 h1:TYi4+3m5t6K48TGI9AUdb+IzbnSxvnvUM github.com/Azure/go-autorest/tracing v0.6.0/go.mod h1:+vhtPC754Xsa23ID7GlGsrdKBpUA79WCAKPPZVC2DeU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 h1:XHOnouVk1mxXfQidrMEnLlPk9UMeRtyBTnEFtxkV0kU= github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2/go.mod h1:wP83P5OoQ5p6ip3ScPr0BAq0BvuPAvacpEuSzyouqAI= -github.com/aws/aws-sdk-go v1.51.13 h1:j6lgtz9E/XFRiYYnGNrAfWvyyTsuYvWvo2RCt0zqAIs= -github.com/aws/aws-sdk-go v1.51.13/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= +github.com/aws/aws-sdk-go v1.51.14 h1:qedX6zZEO1a+5kra+D4ythOYR3TgaROC0hTPxhTFh8I= +github.com/aws/aws-sdk-go v1.51.14/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk= github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM= github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -91,8 +91,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= -github.com/ulikunitz/xz v0.5.11 h1:kpFauv27b6ynzBNT/Xy+1k+fK4WswhN/6PN5WhFAGw8= -github.com/ulikunitz/xz v0.5.11/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= +github.com/ulikunitz/xz v0.5.12 h1:37Nm15o69RwBkXM0J6A5OlE67RZTfzUxTj8fB3dfcsc= +github.com/ulikunitz/xz v0.5.12/go.mod h1:nbz6k7qbPmH4IRqmfOplQw/tblSgqTqBwxkY0oWt/14= github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= diff --git a/hack/docgen/go.mod b/hack/docgen/go.mod index 5fcdceba4..3c5bd152b 100644 --- a/hack/docgen/go.mod +++ b/hack/docgen/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos-hack-docgen -go 1.22.1 +go 1.22.2 // forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes // which are then encoded as a valid YAML blocks with proper indentiation diff --git a/hack/gotagsrewrite/go.mod b/hack/gotagsrewrite/go.mod index 453f231f5..54b28812b 100644 --- a/hack/gotagsrewrite/go.mod +++ b/hack/gotagsrewrite/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/gotagsrewrite -go 1.22.1 +go 1.22.2 require ( github.com/fatih/structtag v1.2.0 diff --git a/hack/module-sig-verify/go.mod b/hack/module-sig-verify/go.mod index 49e91297f..e289f03ea 100644 --- a/hack/module-sig-verify/go.mod +++ b/hack/module-sig-verify/go.mod @@ -1,5 +1,5 @@ module module-sig-verify -go 1.22.1 +go 1.22.2 require go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352 diff --git a/hack/release.toml b/hack/release.toml index 2623b4377..997f22183 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -17,14 +17,14 @@ preface = """\ [notes.updates] title = "Component Updates" description = """\ -Linux: 6.6.21 +Linux: 6.6.24 etcd: 3.5.11 Kubernetes: 1.30.0-rc.1 containerd: 1.7.14 runc: 1.1.12 Flannel: 0.24.4 -Talos is built with Go 1.22.1. +Talos is built with Go 1.22.2. """ [notes.device_selectors] diff --git a/hack/structprotogen/go.mod b/hack/structprotogen/go.mod index 620b52f68..c3ee67340 100644 --- a/hack/structprotogen/go.mod +++ b/hack/structprotogen/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/structprotogen -go 1.22.1 +go 1.22.2 require ( github.com/fatih/structtag v1.2.0 diff --git a/internal/app/apid/main.go b/internal/app/apid/main.go index eaeb236c5..6932b3df5 100644 --- a/internal/app/apid/main.go +++ b/internal/app/apid/main.go @@ -73,7 +73,7 @@ func apidMain() error { startup.LimitMaxProcs(constants.ApidMaxProcs) - runtimeConn, err := grpc.Dial("unix://"+constants.APIRuntimeSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials())) + runtimeConn, err := grpc.NewClient("unix://"+constants.APIRuntimeSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials())) if err != nil { return fmt.Errorf("failed to dial runtime connection: %w", err) } diff --git a/internal/app/apid/pkg/backend/apid.go b/internal/app/apid/pkg/backend/apid.go index 18584277c..7bcbeca0b 100644 --- a/internal/app/apid/pkg/backend/apid.go +++ b/internal/app/apid/pkg/backend/apid.go @@ -95,8 +95,7 @@ func (a *APID) GetConnection(ctx context.Context, fullMethodName string) (contex backoffConfig := backoff.DefaultConfig backoffConfig.MaxDelay = 15 * time.Second - a.conn, err = grpc.DialContext( - ctx, + a.conn, err = grpc.NewClient( fmt.Sprintf("%s:%d", net.FormatAddress(a.target), constants.ApidPort), grpc.WithInitialWindowSize(65535*32), grpc.WithInitialConnWindowSize(65535*16), diff --git a/internal/app/machined/internal/server/v1alpha1/v1alpha1_time_test.go b/internal/app/machined/internal/server/v1alpha1/v1alpha1_time_test.go index 3520915f7..3016b9e11 100644 --- a/internal/app/machined/internal/server/v1alpha1/v1alpha1_time_test.go +++ b/internal/app/machined/internal/server/v1alpha1/v1alpha1_time_test.go @@ -68,7 +68,7 @@ func (suite *TimedSuite) TestTime() { //nolint:errcheck go server.Serve(listener) - conn, err := grpc.Dial( + conn, err := grpc.NewClient( fmt.Sprintf("%s://%s", "unix", listener.Addr().String()), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(dialer.DialUnix()), @@ -102,7 +102,7 @@ func (suite *TimedSuite) TestTimeCheck() { //nolint:errcheck go server.Serve(listener) - conn, err := grpc.Dial( + conn, err := grpc.NewClient( fmt.Sprintf("%s://%s", "unix", listener.Addr().String()), grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithContextDialer(dialer.DialUnix()), diff --git a/internal/app/machined/pkg/controllers/network/operator_spec_test.go b/internal/app/machined/pkg/controllers/network/operator_spec_test.go index 76fec8098..dc250f990 100644 --- a/internal/app/machined/pkg/controllers/network/operator_spec_test.go +++ b/internal/app/machined/pkg/controllers/network/operator_spec_test.go @@ -198,7 +198,7 @@ func (suite *OperatorSpecSuite) assertRunning(runningIDs []string, assertFunc fu } for id := range runningOperators { - found := false //nolint:copyloopvar + found := false for _, expectedID := range runningIDs { if expectedID == id { diff --git a/internal/app/machined/pkg/controllers/runtime/events_sink.go b/internal/app/machined/pkg/controllers/runtime/events_sink.go index 64fbef883..762c5991e 100644 --- a/internal/app/machined/pkg/controllers/runtime/events_sink.go +++ b/internal/app/machined/pkg/controllers/runtime/events_sink.go @@ -161,8 +161,7 @@ func (ctrl *EventsSinkController) Run(ctx context.Context, r controller.Runtime, // establish connection logger.Debug("establishing connection to event sink", zap.String("endpoint", cfg.TypedSpec().Endpoint)) - conn, err = grpc.DialContext( - ctx, + conn, err = grpc.NewClient( cfg.TypedSpec().Endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithSharedWriteBuffer(true), diff --git a/internal/app/machined/pkg/controllers/runtime/machine_status.go b/internal/app/machined/pkg/controllers/runtime/machine_status.go index 0bb482818..2dfb3fca7 100644 --- a/internal/app/machined/pkg/controllers/runtime/machine_status.go +++ b/internal/app/machined/pkg/controllers/runtime/machine_status.go @@ -400,7 +400,7 @@ func (ctrl *MachineStatusController) watchEvents() { ) for ev := range eventCh { - newStage := oldStage //nolint:copyloopvar + newStage := oldStage switch event := ev.Event.Payload.(type) { case *machineapi.SequenceEvent: diff --git a/internal/app/machined/pkg/controllers/siderolink/manager.go b/internal/app/machined/pkg/controllers/siderolink/manager.go index bbe927037..8d7cdfd19 100644 --- a/internal/app/machined/pkg/controllers/siderolink/manager.go +++ b/internal/app/machined/pkg/controllers/siderolink/manager.go @@ -314,11 +314,7 @@ func (ctrl *ManagerController) provision(ctx context.Context, r controller.Runti nodeUUID := sysInfo.TypedSpec().UUID provision := func() (*pb.ProvisionResponse, error) { - connCtx, connCtxCancel := context.WithTimeout(ctx, 10*time.Second) - defer connCtxCancel() - - conn, connErr := grpc.DialContext( - connCtx, + conn, connErr := grpc.NewClient( cfg.TypedSpec().Host, withTransportCredentials(cfg.TypedSpec().Insecure), grpc.WithSharedWriteBuffer(true), diff --git a/internal/app/machined/pkg/system/runner/containerd/containerd_test.go b/internal/app/machined/pkg/system/runner/containerd/containerd_test.go index 297ee5e3d..6f3e01ab6 100644 --- a/internal/app/machined/pkg/system/runner/containerd/containerd_test.go +++ b/internal/app/machined/pkg/system/runner/containerd/containerd_test.go @@ -2,7 +2,6 @@ // License, v. 2.0. If a copy of the MPL was not distributed with this // file, You can obtain one at http://mozilla.org/MPL/2.0/. -//nolint:goconst package containerd_test import ( diff --git a/internal/app/trustd/main.go b/internal/app/trustd/main.go index 69345c9f8..557b15679 100644 --- a/internal/app/trustd/main.go +++ b/internal/app/trustd/main.go @@ -67,7 +67,7 @@ func trustdMain() error { var err error - runtimeConn, err := grpc.Dial( + runtimeConn, err := grpc.NewClient( "unix://"+constants.TrustdRuntimeSocketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithSharedWriteBuffer(true), diff --git a/internal/pkg/cri/client.go b/internal/pkg/cri/client.go index a473720a5..09904324b 100644 --- a/internal/pkg/cri/client.go +++ b/internal/pkg/cri/client.go @@ -32,7 +32,7 @@ func NewClient(endpoint string, connectionTimeout time.Duration) (*Client, error ctx, cancel := context.WithTimeout(context.Background(), connectionTimeout) defer cancel() - conn, err := grpc.DialContext(ctx, endpoint, + conn, err := grpc.DialContext(ctx, endpoint, //nolint:staticcheck // WithBlock is used grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithBlock(), grpc.FailOnNonTempDialError(false), diff --git a/internal/pkg/encryption/keys/kms.go b/internal/pkg/encryption/keys/kms.go index cb9fcc332..f5108fe27 100644 --- a/internal/pkg/encryption/keys/kms.go +++ b/internal/pkg/encryption/keys/kms.go @@ -51,7 +51,7 @@ func (h *KMSKeyHandler) NewKey(ctx context.Context) (*encryption.Key, token.Toke ctx, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() - conn, err := h.getConn(ctx) + conn, err := h.getConn() if err != nil { return nil, nil, fmt.Errorf("error dialing KMS endpoint %q: %w", h.kmsEndpoint, err) } @@ -96,7 +96,7 @@ func (h *KMSKeyHandler) GetKey(ctx context.Context, t token.Token) (*encryption. ctx, cancel := context.WithTimeout(ctx, 10*time.Second) defer cancel() - conn, err := h.getConn(ctx) + conn, err := h.getConn() if err != nil { return nil, fmt.Errorf("error dialing KMS endpoint %q: %w", h.kmsEndpoint, err) } @@ -119,7 +119,7 @@ func (h *KMSKeyHandler) GetKey(ctx context.Context, t token.Token) (*encryption. return encryption.NewKey(h.slot, []byte(base64.StdEncoding.EncodeToString(resp.Data))), nil } -func (h *KMSKeyHandler) getConn(ctx context.Context) (*grpc.ClientConn, error) { +func (h *KMSKeyHandler) getConn() (*grpc.ClientConn, error) { var transportCredentials credentials.TransportCredentials endpoint, err := endpoint.Parse(h.kmsEndpoint) @@ -133,8 +133,7 @@ func (h *KMSKeyHandler) getConn(ctx context.Context) (*grpc.ClientConn, error) { transportCredentials = credentials.NewTLS(&tls.Config{}) } - return grpc.DialContext( - ctx, + return grpc.NewClient( endpoint.Host, grpc.WithTransportCredentials(transportCredentials), grpc.WithSharedWriteBuffer(true), diff --git a/internal/pkg/extensions/validate.go b/internal/pkg/extensions/validate.go index a9097b87d..ed5e56966 100644 --- a/internal/pkg/extensions/validate.go +++ b/internal/pkg/extensions/validate.go @@ -50,7 +50,7 @@ func (ext *Extension) validateConstraints() error { // trim removes 'v' symbol anywhere in string if it's located before the number. func trim(constraint string) string { - for i := 0; i < len(constraint); i++ { //nolint:intrange + for i := 0; i < len(constraint); i++ { if constraint[i] == 'v' && i+1 < len(constraint) && constraint[i+1] >= '0' && constraint[i+1] <= '9' { constraint = constraint[:i] + constraint[i+1:] } diff --git a/pkg/grpc/middleware/auth/basic/basic.go b/pkg/grpc/middleware/auth/basic/basic.go index 0b6aae608..0bd187129 100644 --- a/pkg/grpc/middleware/auth/basic/basic.go +++ b/pkg/grpc/middleware/auth/basic/basic.go @@ -38,7 +38,7 @@ func NewConnection(address string, creds credentials.PerRPCCredentials, ca *x509 grpc.WithSharedWriteBuffer(true), } - conn, err = grpc.Dial(address, grpcOpts...) + conn, err = grpc.NewClient(address, grpcOpts...) if err != nil { return } diff --git a/pkg/grpc/proxy/backend/local.go b/pkg/grpc/proxy/backend/local.go index b31d83fbc..7c9d4ca20 100644 --- a/pkg/grpc/proxy/backend/local.go +++ b/pkg/grpc/proxy/backend/local.go @@ -57,8 +57,7 @@ func (l *Local) GetConnection(ctx context.Context, fullMethodName string) (conte } var err error - l.conn, err = grpc.DialContext( - ctx, + l.conn, err = grpc.NewClient( "unix:"+l.socketPath, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithDefaultCallOptions( diff --git a/pkg/machinery/client/client.go b/pkg/machinery/client/client.go index 94552c45e..d7443abca 100644 --- a/pkg/machinery/client/client.go +++ b/pkg/machinery/client/client.go @@ -159,7 +159,7 @@ func New(ctx context.Context, opts ...OptionFunc) (c *Client, err error) { return nil, errors.New("failed to determine endpoints") } - c.conn, err = c.getConn(ctx) + c.conn, err = c.getConn() if err != nil { return nil, fmt.Errorf("failed to create client connection: %w", err) } diff --git a/pkg/machinery/client/connection.go b/pkg/machinery/client/connection.go index 94d5c11a7..90b43bc90 100644 --- a/pkg/machinery/client/connection.go +++ b/pkg/machinery/client/connection.go @@ -5,7 +5,6 @@ package client import ( - "context" "crypto/tls" "crypto/x509" "encoding/base64" @@ -32,7 +31,7 @@ func (c *Client) Conn() *grpc.ClientConn { } // getConn creates new gRPC connection. -func (c *Client) getConn(ctx context.Context, opts ...grpc.DialOption) (*grpcConnectionWrapper, error) { +func (c *Client) getConn(opts ...grpc.DialOption) (*grpcConnectionWrapper, error) { endpoints := c.GetEndpoints() target := c.getTarget( @@ -53,7 +52,7 @@ func (c *Client) getConn(ctx context.Context, opts ...grpc.DialOption) (*grpcCon dialOpts = append(dialOpts, opts...) if c.options.unixSocketPath != "" { - conn, err := grpc.DialContext(ctx, target, dialOpts...) + conn, err := grpc.NewClient(target, dialOpts...) return newGRPCConnectionWrapper(c.GetClusterName(), conn), err } @@ -61,7 +60,7 @@ func (c *Client) getConn(ctx context.Context, opts ...grpc.DialOption) (*grpcCon tlsConfig := c.options.tlsConfig if tlsConfig != nil { - return c.makeConnection(ctx, target, credentials.NewTLS(tlsConfig), dialOpts) + return c.makeConnection(target, credentials.NewTLS(tlsConfig), dialOpts) } if err := c.resolveConfigContext(); err != nil { @@ -103,7 +102,7 @@ func (c *Client) getConn(ctx context.Context, opts ...grpc.DialOption) (*grpcCon return nil, err } - return c.makeConnection(ctx, target, creds, dialOpts) + return c.makeConnection(target, creds, dialOpts) } func buildTLSConfig(configContext *clientconfig.Context) (*tls.Config, error) { @@ -135,13 +134,13 @@ func buildTLSConfig(configContext *clientconfig.Context) (*tls.Config, error) { return tlsConfig, nil } -func (c *Client) makeConnection(ctx context.Context, target string, creds credentials.TransportCredentials, dialOpts []grpc.DialOption) (*grpcConnectionWrapper, error) { +func (c *Client) makeConnection(target string, creds credentials.TransportCredentials, dialOpts []grpc.DialOption) (*grpcConnectionWrapper, error) { dialOpts = append(dialOpts, grpc.WithTransportCredentials(creds), grpc.WithInitialWindowSize(65535*32), grpc.WithInitialConnWindowSize(65535*16)) - conn, err := grpc.DialContext(ctx, target, dialOpts...) + conn, err := grpc.NewClient(target, dialOpts...) return newGRPCConnectionWrapper(c.GetClusterName(), conn), err } diff --git a/pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go b/pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go index 5b1a6ef0b..76d440928 100644 --- a/pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go +++ b/pkg/machinery/config/types/v1alpha1/v1alpha1_validation.go @@ -802,7 +802,7 @@ func CheckDeviceAddressing(d *Device, bondedInterfaces map[string]string) ([]str // CheckDeviceRoutes ensures that the specified routes are valid. // -//nolint:gocyclo,goconst +//nolint:gocyclo func CheckDeviceRoutes(d *Device, _ map[string]string) ([]string, error) { var result *multierror.Error diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index ee57d9e50..a33e3c728 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -3,8 +3,6 @@ // file, You can obtain one at http://mozilla.org/MPL/2.0/. // Package constants defines constants used throughout Talos. -// -//nolint:goconst package constants import ( @@ -16,7 +14,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.6.23-talos" + DefaultKernelVersion = "6.6.24-talos" // KernelModulesPath is the default path to the kernel modules without the kernel version. KernelModulesPath = "/lib/modules" @@ -883,7 +881,7 @@ const ( DBusClientSocketPath = "/run/dbus/system_bus_socket" // GoVersion is the version of Go compiler this release was built with. - GoVersion = "go1.22.1" + GoVersion = "go1.22.2" // KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API. KubernetesTalosAPIServiceName = "talos" diff --git a/pkg/machinery/gendata/data/extras b/pkg/machinery/gendata/data/extras index b7c8e167d..613982274 100644 --- a/pkg/machinery/gendata/data/extras +++ b/pkg/machinery/gendata/data/extras @@ -1 +1 @@ -v1.7.0 \ No newline at end of file +v1.7.0-1-gbb76755 \ No newline at end of file diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index ec8a0286b..dd12ac5ac 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.7.0-1-gd57b0ad \ No newline at end of file +v1.7.0-2-g6101299 \ No newline at end of file diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index fbf3912fd..ab0af53af 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos/pkg/machinery -go 1.22.1 +go 1.22.2 // forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes // which are then encoded as a valid YAML blocks with proper indentiation @@ -9,7 +9,7 @@ replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20220527175918-f17b require ( github.com/blang/semver/v4 v4.0.0 github.com/containerd/go-cni v1.1.9 - github.com/cosi-project/runtime v0.4.0-alpha.9 + github.com/cosi-project/runtime v0.4.0 github.com/dustin/go-humanize v1.0.1 github.com/emicklei/dot v1.6.1 github.com/evanphx/json-patch v5.9.0+incompatible @@ -29,7 +29,7 @@ require ( github.com/siderolabs/protoenc v0.2.1 github.com/stretchr/testify v1.9.0 google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda - google.golang.org/grpc v1.62.1 + google.golang.org/grpc v1.63.0 google.golang.org/protobuf v1.33.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -43,7 +43,6 @@ require ( github.com/containernetworking/cni v1.1.2 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gertd/go-pluralize v0.2.1 // indirect - github.com/golang/protobuf v1.5.4 // indirect github.com/google/go-cmp v0.6.0 // indirect github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect github.com/grpc-ecosystem/grpc-gateway/v2 v2.19.1 // indirect @@ -61,7 +60,7 @@ require ( go.uber.org/multierr v1.11.0 // indirect go.uber.org/zap v1.27.0 // indirect golang.org/x/crypto v0.21.0 // indirect - golang.org/x/net v0.22.0 // indirect + golang.org/x/net v0.23.0 // indirect golang.org/x/sync v0.6.0 // indirect golang.org/x/sys v0.18.0 // indirect golang.org/x/text v0.14.0 // indirect diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index 19f5b763e..b5e724a86 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -24,8 +24,8 @@ github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9 github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ= github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -github.com/cosi-project/runtime v0.4.0-alpha.9 h1:c4PLjpZW19TYk7Y++gXDOpD+sM0YFSsr189p49/EHMY= -github.com/cosi-project/runtime v0.4.0-alpha.9/go.mod h1:Was5rgpxPSJfNqbw01atuWHer5KYMtzhwJm02+xbU90= +github.com/cosi-project/runtime v0.4.0 h1:sK4UYOvafWzb0/doZf3wl/Pob2lZD3DgZTo7tzGW/Lw= +github.com/cosi-project/runtime v0.4.0/go.mod h1:DOeuuUaUE1c5c4biqkDZWTfCJl6BdYtxuOzvRVOoRV8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -55,8 +55,6 @@ github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvq github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiuN0vRsmY= -github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek= -github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= @@ -114,8 +112,8 @@ github.com/planetscale/vtprotobuf v0.6.0 h1:nBeETjudeJ5ZgBHUz1fVHvbqUKnYOXNhsIEa github.com/planetscale/vtprotobuf v0.6.0/go.mod h1:t/avpk3KcrXxUnYOhZhMXJlSEyie6gQbtLq5NM3loB8= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= -github.com/rogpeppe/go-internal v1.10.0 h1:TMyTOH3F/DB16zRVcYyreMH6GnZZrwQVAoYjRBZyWFQ= -github.com/rogpeppe/go-internal v1.10.0/go.mod h1:UQnix2H7Ngw/k4C5ijL5+65zddjncjaFoBhdsK/akog= +github.com/rogpeppe/go-internal v1.12.0 h1:exVL4IDcn6na9z1rAb56Vxr+CgyK3nn3O+epU5NdKM8= +github.com/rogpeppe/go-internal v1.12.0/go.mod h1:E+RYuTGaKKdloAfM02xzb0FW3Paa99yedzYV+kq4uf4= github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkBk= github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4= @@ -177,8 +175,8 @@ golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug golang.org/x/net v0.2.0/go.mod h1:KqCZLdyyvdV855qA2rE3GC2aiw5xGR5TEjj8smXukLY= golang.org/x/net v0.6.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs= golang.org/x/net v0.8.0/go.mod h1:QVkue5JL9kW//ek3r6jTKnTFis1tRmNAW2P1shuFdJc= -golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc= -golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= +golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -240,8 +238,8 @@ google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda h1: google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda/go.mod h1:AHcE/gZH76Bk/ROZhQphlRoWo5xKDEtz3eVEO1LfA8c= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda h1:LI5DOvAxUPMv/50agcLLoo+AdWc1irS9Rzz4vPuD1V4= google.golang.org/genproto/googleapis/rpc v0.0.0-20240401170217-c3f982113cda/go.mod h1:WtryC6hu0hhx87FDGxWCDptyssuo68sk10vYjF+T9fY= -google.golang.org/grpc v1.62.1 h1:B4n+nfKzOICUXMgyrNd19h/I9oH0L1pizfk1d4zSgTk= -google.golang.org/grpc v1.62.1/go.mod h1:IWTG0VlJLCh1SkC58F7np9ka9mx/WNkjl4PGJaiq+QE= +google.golang.org/grpc v1.63.0 h1:WjKe+dnvABXyPJMD7KDNLxtoGk5tgk+YFWN6cBWjZE8= +google.golang.org/grpc v1.63.0/go.mod h1:WAX/8DgncnokcFUldAxq7GeB5DXHDbMF+lLvDomNkRA= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8= google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0= google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=