diff --git a/cmd/talosctl/cmd/mgmt/loadbalancer_launch.go b/cmd/talosctl/cmd/mgmt/loadbalancer_launch.go index d588b2e56..4dec9f248 100644 --- a/cmd/talosctl/cmd/mgmt/loadbalancer_launch.go +++ b/cmd/talosctl/cmd/mgmt/loadbalancer_launch.go @@ -8,8 +8,8 @@ import ( "fmt" "github.com/siderolabs/gen/slices" + "github.com/siderolabs/go-loadbalancer/loadbalancer" "github.com/spf13/cobra" - "github.com/talos-systems/go-loadbalancer/loadbalancer" "github.com/talos-systems/talos/pkg/machinery/constants" ) diff --git a/go.mod b/go.mod index 1aa51e527..78aca03d7 100644 --- a/go.mod +++ b/go.mod @@ -30,7 +30,7 @@ require ( require ( cloud.google.com/go/compute v1.10.0 github.com/BurntSushi/toml v1.2.0 - github.com/aws/aws-sdk-go v1.44.105 + github.com/aws/aws-sdk-go v1.44.110 github.com/beevik/ntp v0.3.0 github.com/cenkalti/backoff/v4 v4.1.3 github.com/containerd/cgroups v1.0.4 @@ -55,7 +55,7 @@ require ( github.com/golang/mock v1.6.0 github.com/google/go-cmp v0.5.9 github.com/google/gopacket v1.1.19 - github.com/google/nftables v0.0.0-20220906152720-cbeb0fb1eccf + github.com/google/nftables v0.0.0-20221002140148-535f5eb8da79 github.com/google/uuid v1.3.0 github.com/gosuri/uiprogress v0.0.1 github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 @@ -64,7 +64,7 @@ require ( github.com/hashicorp/go-multierror v1.1.1 github.com/hashicorp/go-version v1.6.0 github.com/hetznercloud/hcloud-go v1.35.3 - github.com/insomniacslk/dhcp v0.0.0-20220915225810-043f1726f02e + github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c github.com/jsimonetti/rtnetlink v1.2.2 github.com/jxskiss/base62 v1.1.0 github.com/martinlindhe/base36 v1.1.1 @@ -74,9 +74,9 @@ require ( github.com/mdlayher/genetlink v1.2.0 github.com/mdlayher/netlink v1.6.2 github.com/mdlayher/netx v0.0.0-20220422152302-c711c2f8512f - github.com/opencontainers/image-spec v1.1.0-rc1 + github.com/opencontainers/image-spec v1.1.0-rc2 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 - github.com/packethost/packngo v0.26.0 + github.com/packethost/packngo v0.28.0 github.com/pelletier/go-toml v1.9.5 github.com/pin/tftp v2.1.0+incompatible github.com/pmorjan/kmod v1.0.0 @@ -90,23 +90,23 @@ require ( github.com/siderolabs/crypto v0.4.0 github.com/siderolabs/discovery-api v0.1.1 github.com/siderolabs/discovery-client v0.1.2 - github.com/siderolabs/gen v0.2.0 + github.com/siderolabs/gen v0.3.0 github.com/siderolabs/go-blockdevice v0.4.0 + github.com/siderolabs/go-loadbalancer v0.2.0 github.com/siderolabs/go-pcidb v0.1.0 github.com/siderolabs/go-pointer v1.0.0 + github.com/siderolabs/go-smbios v0.3.0 + github.com/siderolabs/siderolink v0.2.0 github.com/spf13/cobra v1.5.0 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.8.0 github.com/talos-systems/go-cmd v0.1.0 github.com/talos-systems/go-debug v0.2.1 github.com/talos-systems/go-kmsg v0.1.1 - github.com/talos-systems/go-loadbalancer v0.1.3 github.com/talos-systems/go-procfs v0.1.0 github.com/talos-systems/go-retry v0.3.1 - github.com/talos-systems/go-smbios v0.2.0 github.com/talos-systems/grpc-proxy v0.3.1 github.com/talos-systems/net v0.3.2 - github.com/talos-systems/siderolink v0.1.2 github.com/talos-systems/talos/pkg/machinery v1.3.0-alpha.0 github.com/u-root/u-root v0.9.0 github.com/vishvananda/netlink v1.2.1-beta.2 @@ -131,7 +131,6 @@ require ( google.golang.org/protobuf v1.28.1 gopkg.in/freddierice/go-losetup.v1 v1.0.0-20170407175016-fc9adea44124 gopkg.in/yaml.v3 v3.0.1 - inet.af/netaddr v0.0.0-20220811202034-502d2d690317 k8s.io/klog/v2 v2.80.1 kernel.org/pub/linux/libs/security/libcap/cap v1.2.66 sigs.k8s.io/yaml v1.3.0 @@ -269,8 +268,6 @@ require ( go.opentelemetry.io/otel/trace v1.10.0 // indirect go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect go.uber.org/multierr v1.8.0 // indirect - go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect - go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect @@ -280,7 +277,7 @@ require ( golang.zx2c4.com/wireguard v0.0.0-20220407013110-ef5c587f782d // indirect google.golang.org/api v0.96.0 // indirect google.golang.org/appengine v1.6.7 // indirect - google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc // indirect + google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 // indirect gopkg.in/inf.v0 v0.9.1 // indirect gopkg.in/ini.v1 v1.66.2 // indirect gopkg.in/yaml.v2 v2.4.0 // indirect diff --git a/go.sum b/go.sum index e16ee29a8..96e8ce521 100644 --- a/go.sum +++ b/go.sum @@ -132,8 +132,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.15.78/go.mod h1:E3/ieXAlvM0XWO57iftYVDLLvQ824smPP3ATZkfNZeM= -github.com/aws/aws-sdk-go v1.44.105 h1:UUwoD1PRKIj3ltrDUYTDQj5fOTK3XsnqolLpRTMmSEM= -github.com/aws/aws-sdk-go v1.44.105/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= +github.com/aws/aws-sdk-go v1.44.110 h1:unno3l2FYQo6p0wYCp9gUk8YNzhOxqSktM0Y1vukl9k= +github.com/aws/aws-sdk-go v1.44.110/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw= github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -378,7 +378,6 @@ github.com/docopt/docopt-go v0.0.0-20180111231733-ee0de3bc6815/go.mod h1:WwZ+bS3 github.com/dustin/go-humanize v0.0.0-20171111073723-bb3d318650d4/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/dvyukov/go-fuzz v0.0.0-20210103155950-6a8e9d1f2415/go.mod h1:11Gm+ccJnvAhCNLlf5+cS9KjtbaD5I5zaZpFMsTHWTw= github.com/elazarl/goproxy v0.0.0-20180725130230-947c36da3153/go.mod h1:/Zj4wYkgs4iZTTu3o/KG3Itv/qCCa8VVMlb3i9OVuzc= github.com/elazarl/goproxy v0.0.0-20190911111923-ecfe977594f1 h1:yY9rWGoXv1U5pl4gxqlULARMQD7x0QG85lqEXTWysik= github.com/emicklei/dot v1.0.0 h1:yyObALINBOuI1GdCRwVea2IPtGtVgh0NQgJDrE03Tqc= @@ -564,8 +563,8 @@ github.com/google/martian/v3 v3.0.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIG github.com/google/martian/v3 v3.1.0/go.mod h1:y5Zk1BBys9G+gd6Jrk0W3cC1+ELVxBWuIGO+w/tUAp0= github.com/google/martian/v3 v3.2.1 h1:d8MncMlErDFTwQGBK1xhv026j9kqhvw1Qv9IbWT1VLQ= github.com/google/martian/v3 v3.2.1/go.mod h1:oBOf6HBosgwRXnUGWUB05QECsc6uvmMiJ3+6W4l/CUk= -github.com/google/nftables v0.0.0-20220906152720-cbeb0fb1eccf h1:RlbIOMRXSrPwpDI4EMsEVWO4wFXEEIELnO5q8jSTwHs= -github.com/google/nftables v0.0.0-20220906152720-cbeb0fb1eccf/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc= +github.com/google/nftables v0.0.0-20221002140148-535f5eb8da79 h1:gHlwshQh1WGK6ghd5f4n3q8tV2/gNN8fp8fjmxKb07U= +github.com/google/nftables v0.0.0-20221002140148-535f5eb8da79/go.mod h1:b97ulCCFipUC+kSin+zygkvUVpx0vyIAwxXFdY3PlNc= github.com/google/pprof v0.0.0-20181206194817-3ea8567a2e57/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20190515194954-54271f7e092f/go.mod h1:zfwlbNMJ+OItoe0UupaVj+oy1omPYYDuagoSzA8v9mc= github.com/google/pprof v0.0.0-20191218002539-d4f498aebedc/go.mod h1:ZgVRPoUq/hfqzAqh7sHMqb3I9Rq5C59dIz2SbBwJ4eM= @@ -687,8 +686,8 @@ github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/insomniacslk/dhcp v0.0.0-20220915225810-043f1726f02e h1:SMDoAIN7Unk0AXtIQW0QzEau5eoSYczTtp5xKoe7dVE= -github.com/insomniacslk/dhcp v0.0.0-20220915225810-043f1726f02e/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= +github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c h1:OCFM4+DXTWfNlyeoddrTwdup/ztkGSyAMR2UGcPckNQ= +github.com/insomniacslk/dhcp v0.0.0-20221001123530-5308ebe5334c/go.mod h1:h+MxyHxRg9NH3terB1nfRIUaQEcI0XOVkdR9LNBlp8E= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= github.com/jmespath/go-jmespath v0.0.0-20160202185014-0b12d6b521d8/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= github.com/jmespath/go-jmespath v0.0.0-20160803190731-bd40a432e4c7/go.mod h1:Nht3zPeWKUH0NzdCt2Blrr5ys8VGpn0CEB0cQHVjt7k= @@ -909,8 +908,8 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/image-spec v1.1.0-rc1 h1:lfG+OTa7V8PD3PKvkocSG9KAcA9MANqJn53m31Fvwkc= -github.com/opencontainers/image-spec v1.1.0-rc1/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= +github.com/opencontainers/image-spec v1.1.0-rc2 h1:2zx/Stx4Wc5pIPDvIxHXvXtQFW/7XWJGmnM7r3wg034= +github.com/opencontainers/image-spec v1.1.0-rc2/go.mod h1:3OVijpioIKYWTqjiG0zfF6wvoJ4fAXGbjdZuI2NgsRQ= github.com/opencontainers/runc v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= @@ -934,8 +933,8 @@ github.com/opencontainers/selinux v1.10.0/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuh github.com/opencontainers/selinux v1.10.1 h1:09LIPVRP3uuZGQvgR+SgMSNBd1Eb3vlRbGqQpoHsF8w= github.com/opencontainers/selinux v1.10.1/go.mod h1:2i0OySw99QjzBBQByd1Gr9gSjvuho1lHsJxIJ3gGbJI= github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o= -github.com/packethost/packngo v0.26.0 h1:jbPHPEd+KpoM2OBQ3EgbgEYiAUK7vpZ9XhqOMEbnk78= -github.com/packethost/packngo v0.26.0/go.mod h1:/UHguFdPs6Lf6FOkkSEPnRY5tgS0fsVM+Zv/bvBrmt0= +github.com/packethost/packngo v0.28.0 h1:3KSmYGgVzVxgH/oYCA+45L1OnPIKU/kWu6uEduB/7qY= +github.com/packethost/packngo v0.28.0/go.mod h1:/UHguFdPs6Lf6FOkkSEPnRY5tgS0fsVM+Zv/bvBrmt0= github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= github.com/pelletier/go-toml v1.8.1/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc= @@ -1045,16 +1044,22 @@ github.com/siderolabs/discovery-api v0.1.1 h1:DI+CjD/Nl0nIk8qkaNKz1sEquWTEKHKH4+ github.com/siderolabs/discovery-api v0.1.1/go.mod h1:JnJg4h1HbAhOazQl0lYHEjrg63rg/cf9r2te6/DqUxo= github.com/siderolabs/discovery-client v0.1.2 h1:QsNwt/boSPM+f8Ww+GlAMv2+9o5KPhLdPUfjvVuNIm8= github.com/siderolabs/discovery-client v0.1.2/go.mod h1:4ahEk2dMPKAGCLK5sRUxHfVryROxflwDPL+2c5MrLMI= -github.com/siderolabs/gen v0.2.0 h1:Fq+lXJmry1C+bMvp9IipyHX4nUq4j132BrpuV1vWbd8= -github.com/siderolabs/gen v0.2.0/go.mod h1:vzcXVRNpo9j2tyQJU+9ZQ1J6yoebX9KL1TkHt18HNqw= +github.com/siderolabs/gen v0.3.0 h1:tMWVK9+EEXhGdGYTCuox0Bb4kpRjJzx7aUn4Txzw2GE= +github.com/siderolabs/gen v0.3.0/go.mod h1:vzcXVRNpo9j2tyQJU+9ZQ1J6yoebX9KL1TkHt18HNqw= github.com/siderolabs/go-blockdevice v0.4.0 h1:b+5b4Lu35U6MFXQDE2g0hAW6pTqkJypPF8WbktbbXlQ= github.com/siderolabs/go-blockdevice v0.4.0/go.mod h1:viu/gYeRpdr41UcR39SjlFr4vID4WyaIuGd8lOKuyA4= +github.com/siderolabs/go-loadbalancer v0.2.0 h1:Uv7nJqIwqtRVgUShsQwHmThfJTugpDhmizIvYwa/Rdk= +github.com/siderolabs/go-loadbalancer v0.2.0/go.mod h1:pWeG20ljyAL4PTJehpDnkoEHUr8ZL/6C/zpfgPtbe70= github.com/siderolabs/go-pcidb v0.1.0 h1:6cJPBBmHlIF4GouYR/1g3JXS/niAON+6lIOfKl/t794= github.com/siderolabs/go-pcidb v0.1.0/go.mod h1:wT/tUxNZFlKSuGBniVwXL53vlGQq2/CVu16y6sMGIao= github.com/siderolabs/go-pointer v1.0.0 h1:6TshPKep2doDQJAAtHUuHWXbca8ZfyRySjSBT/4GsMU= github.com/siderolabs/go-pointer v1.0.0/go.mod h1:HTRFUNYa3R+k0FFKNv11zgkaCLzEkWVzoYZ433P3kHc= +github.com/siderolabs/go-smbios v0.3.0 h1:v3ycVVnpKUXj+dUExW1TQL9mv0ZHDLTX+W4c1BOP0hw= +github.com/siderolabs/go-smbios v0.3.0/go.mod h1:Yyyj/yY9qrYTXZnQViyhGuCV4b3IRSZNj3sOXrLvl/c= github.com/siderolabs/protoenc v0.2.0 h1:QFxWIAo//12+/bm27GNYoK/TpQGTYsRrrZCu9jSghvU= github.com/siderolabs/protoenc v0.2.0/go.mod h1:mu4gc6pJxhdJYpuloacKE4jsJojj87qDXwn8LUvs2bY= +github.com/siderolabs/siderolink v0.2.0 h1:IbiHdiMSpyXWPtuNxUvhm9tP5jCG2G3ITPCESbIL61E= +github.com/siderolabs/siderolink v0.2.0/go.mod h1:/ujfvQ/pGLP1NZfSYPaV76LNq0MBU+Fmy37I+P1WzO4= github.com/sirupsen/logrus v1.0.4-0.20170822132746-89742aefa4b2/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc= github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo= @@ -1128,20 +1133,14 @@ github.com/talos-systems/go-debug v0.2.1 h1:VSN8P1zXWeHWgUBZn4cVT3keBcecCAJBG9Up github.com/talos-systems/go-debug v0.2.1/go.mod h1:pR4NjsZQNFqGx3n4qkD4MIj1F2CxyIF8DCiO1+05JO0= github.com/talos-systems/go-kmsg v0.1.1 h1:iCzV/6oPpClBP6uEoqer1+ceaW6hM1AtpeGV+9zJeXI= github.com/talos-systems/go-kmsg v0.1.1/go.mod h1:dppwQn+/mrdvsziGMbXjzfc4E+75oZhr39UIP6LgL0w= -github.com/talos-systems/go-loadbalancer v0.1.3 h1:CiYyeM8R7OjJGcY3M12Db6u58p95i2z5vwW50QQWx48= -github.com/talos-systems/go-loadbalancer v0.1.3/go.mod h1:IrSlVos79xXNRhONI7Eq/7OGmxmbm2i4Yg1KZroVoHg= github.com/talos-systems/go-procfs v0.1.0 h1:AuS3/4fx5Me6CUyPVDxBH79eSSnl+8C83tzGmsMAPzs= github.com/talos-systems/go-procfs v0.1.0/go.mod h1:ATyUGFQIW8OnbnmvqefZWVPgL9g+CAmXHfkgny21xX8= github.com/talos-systems/go-retry v0.3.1 h1:GjjyHB8i1CJpb1O5qYPMljq74cRQ5uiDoyMaWddA5FA= github.com/talos-systems/go-retry v0.3.1/go.mod h1:HiXQqyVStZ35uSY/MTLWVvQVmC3lIW2MS5VdDaMtoKM= -github.com/talos-systems/go-smbios v0.2.0 h1:Ga7gLxeOGg7q1V7dtGzzC6EbSxm/vyi0EBKinbtJ6x4= -github.com/talos-systems/go-smbios v0.2.0/go.mod h1:vk76naUSZaWE8Z95wbDn51FgH0goECM4oK3KY2hYSMU= github.com/talos-systems/grpc-proxy v0.3.1 h1:KoFocTDI8KO7A8j7Md6mxzuUQNb2LmBBEuKSuQjkfOA= github.com/talos-systems/grpc-proxy v0.3.1/go.mod h1:UkADMMY5dWvfyaoWk+knJxnkEZq9k/MX4rVXPm6GUtQ= github.com/talos-systems/net v0.3.2 h1:IMseRyuha8fNsv/3FbQPRE9hLVRBEFR+9sxcoETQ5vI= github.com/talos-systems/net v0.3.2/go.mod h1:zhcGixNJz9dgwFiUwc7gkkAqdVqXagU1SNNoIVXYKGo= -github.com/talos-systems/siderolink v0.1.2 h1:Ij+QqZfOm/W+81sMlZRK8ry2u1K8auPxYF9iuubx8IE= -github.com/talos-systems/siderolink v0.1.2/go.mod h1:1PLRyKRx+MAkz1vWJXIP19p5wChF0TejbIbX/CQMWuw= github.com/tchap/go-patricia v2.2.6+incompatible/go.mod h1:bmLyhP68RS6kStMGxByiQ23RP/odRBOTVjwp2cDyi6I= github.com/tmc/grpc-websocket-proxy v0.0.0-20170815181823-89b8d40f7ca8/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= @@ -1258,14 +1257,8 @@ go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q= go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo= go.uber.org/zap v1.23.0 h1:OjGQ5KQDEUawVHxNwQgPpiypGHOxo2mNZsOqTak4fFY= go.uber.org/zap v1.23.0/go.mod h1:D+nX8jyLsMHMYrln8A0rJjFt/T/9/bGgIhAqxv5URuY= -go4.org/intern v0.0.0-20211027215823-ae77deb06f29/go.mod h1:cS2ma+47FKrLPdXFpr7CuxiTW3eyJbWew4qx0qtQWDA= -go4.org/intern v0.0.0-20220617035311-6925f38cc365 h1:t9hFvR102YlOqU0fQn1wgwhNvSbHGBbbJxX9JKfU3l0= -go4.org/intern v0.0.0-20220617035311-6925f38cc365/go.mod h1:WXRv3p7T6gzt0CcJm43AAKdKVZmcQbwwC7EwquU5BZU= go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab h1:+yW1yrZ09EYNu1spCUOHBBNRbrLnfmutwyhbhCv3b6Q= go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab/go.mod h1:tgPU4N2u9RByaTN3NC2p9xOzyFpte4jYwsIIRF7XlSc= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 h1:FyBZqvoA/jbNzuAWLQE2kG820zMAkcilx6BMjGbL/E4= -go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760/go.mod h1:FftLjUGFEDu5k8lt0ddY+HcrH/qU/0qk+H8j9/nTl3E= golang.org/x/crypto v0.0.0-20171113213409-9f005a07e0d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= @@ -1797,8 +1790,8 @@ google.golang.org/genproto v0.0.0-20220608133413-ed9918b62aac/go.mod h1:KEWEmljW google.golang.org/genproto v0.0.0-20220616135557-88e70c0c3a90/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220617124728-180714bec0ad/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= google.golang.org/genproto v0.0.0-20220624142145-8cd45d7dbd1f/go.mod h1:KEWEmljWE5zPzLBa/oHl6DaEt9LmfH6WtH1OHIvleBA= -google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc h1:saaNe2+SBQxandnzcD/qB1JEBQ2Pqew+KlFLLdA/XcM= -google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc/go.mod h1:yEEpwVWKMZZzo81NwRgyEJnA2fQvpXAYPVisv8EgDVs= +google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 h1:Ezh2cpcnP5Rq60sLensUsFnxh7P6513NLvNtCm9iyJ4= +google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= google.golang.org/grpc v0.0.0-20160317175043-d3ddb4469d5a/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38= @@ -1904,8 +1897,6 @@ honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWh honnef.co/go/tools v0.0.1-2019.2.3/go.mod h1:a3bituU0lyd329TUQxRnasdCoJDkEUEAqEt0JzvZhAg= honnef.co/go/tools v0.0.1-2020.1.3/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= honnef.co/go/tools v0.0.1-2020.1.4/go.mod h1:X/FiERA/W4tHapMX5mGpAtMSVEeEUOyHaw9vFzvIQ3k= -inet.af/netaddr v0.0.0-20220811202034-502d2d690317 h1:U2fwK6P2EqmopP/hFLTOAjWTki0qgd4GMJn5X8wOleU= -inet.af/netaddr v0.0.0-20220811202034-502d2d690317/go.mod h1:OIezDfdzOgFhuw4HuWapWq2e9l0H9tK4F1j+ETRtF3k= k8s.io/api v0.20.1/go.mod h1:KqwcCVogGxQY3nBlRpwt+wpAMF/KjaCc7RpywacvqUo= k8s.io/api v0.20.4/go.mod h1:++lNL1AJMkDymriNniQsWRkMDzRaX2Y/POTUi8yvqYQ= k8s.io/api v0.20.6/go.mod h1:X9e8Qag6JV/bL5G6bU8sdVRltWKmdHsFUGS3eVndqE8= diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod index 25aa51785..c61a21046 100644 --- a/hack/cloud-image-uploader/go.mod +++ b/hack/cloud-image-uploader/go.mod @@ -7,7 +7,7 @@ require ( github.com/google/uuid v1.3.0 github.com/spf13/pflag v1.0.5 github.com/talos-systems/go-retry v0.3.1 - golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 + golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 ) require ( diff --git a/hack/cloud-image-uploader/go.sum b/hack/cloud-image-uploader/go.sum index a1c7d8d3d..29f3d4757 100644 --- a/hack/cloud-image-uploader/go.sum +++ b/hack/cloud-image-uploader/go.sum @@ -20,8 +20,8 @@ github.com/talos-systems/go-retry v0.3.1/go.mod h1:HiXQqyVStZ35uSY/MTLWVvQVmC3lI golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk= golang.org/x/net v0.0.0-20220909164309-bea034e7d591 h1:D0B/7al0LLrVC8aWF4+oxpv/m8bc7ViFfVS8/gXGdqI= golang.org/x/net v0.0.0-20220909164309-bea034e7d591/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7 h1:ZrnxWX62AgTKOSagEqxvb3ffipvEDX2pl7E1TdqLqIc= -golang.org/x/sync v0.0.0-20220923202941-7f9b1623fab7/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0 h1:cu5kTvlzcw1Q5S9f5ip1/cpiB4nXvw1XYzFPGgzLUOY= +golang.org/x/sync v0.0.0-20220929204114-8fcdb60fdcc0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= diff --git a/internal/app/machined/pkg/adapters/hardware/memorymodule.go b/internal/app/machined/pkg/adapters/hardware/memorymodule.go index 29f0e7bcc..c11c4d8a9 100644 --- a/internal/app/machined/pkg/adapters/hardware/memorymodule.go +++ b/internal/app/machined/pkg/adapters/hardware/memorymodule.go @@ -5,7 +5,7 @@ package hardware import ( - "github.com/talos-systems/go-smbios/smbios" + "github.com/siderolabs/go-smbios/smbios" "github.com/talos-systems/talos/pkg/machinery/resources/hardware" ) diff --git a/internal/app/machined/pkg/adapters/hardware/processor.go b/internal/app/machined/pkg/adapters/hardware/processor.go index b72362f69..45886279e 100644 --- a/internal/app/machined/pkg/adapters/hardware/processor.go +++ b/internal/app/machined/pkg/adapters/hardware/processor.go @@ -5,7 +5,7 @@ package hardware import ( - "github.com/talos-systems/go-smbios/smbios" + "github.com/siderolabs/go-smbios/smbios" "github.com/talos-systems/talos/pkg/machinery/resources/hardware" ) diff --git a/internal/app/machined/pkg/adapters/hardware/system_information.go b/internal/app/machined/pkg/adapters/hardware/system_information.go index 2f858f214..c2005427d 100644 --- a/internal/app/machined/pkg/adapters/hardware/system_information.go +++ b/internal/app/machined/pkg/adapters/hardware/system_information.go @@ -5,7 +5,7 @@ package hardware import ( - "github.com/talos-systems/go-smbios/smbios" + "github.com/siderolabs/go-smbios/smbios" "github.com/talos-systems/talos/pkg/machinery/resources/hardware" ) diff --git a/internal/app/machined/pkg/controllers/hardware/system.go b/internal/app/machined/pkg/controllers/hardware/system.go index 14f4f6277..857b5d835 100644 --- a/internal/app/machined/pkg/controllers/hardware/system.go +++ b/internal/app/machined/pkg/controllers/hardware/system.go @@ -11,7 +11,7 @@ import ( "github.com/cosi-project/runtime/pkg/controller" "github.com/cosi-project/runtime/pkg/resource" - "github.com/talos-systems/go-smbios/smbios" + "github.com/siderolabs/go-smbios/smbios" "go.uber.org/zap" hwadapter "github.com/talos-systems/talos/internal/app/machined/pkg/adapters/hardware" diff --git a/internal/app/machined/pkg/controllers/hardware/system_test.go b/internal/app/machined/pkg/controllers/hardware/system_test.go index 76f71b926..89264c1f1 100644 --- a/internal/app/machined/pkg/controllers/hardware/system_test.go +++ b/internal/app/machined/pkg/controllers/hardware/system_test.go @@ -11,9 +11,9 @@ import ( "time" "github.com/cosi-project/runtime/pkg/resource" + "github.com/siderolabs/go-smbios/smbios" "github.com/stretchr/testify/suite" "github.com/talos-systems/go-retry/retry" - "github.com/talos-systems/go-smbios/smbios" hardwarectrl "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/hardware" runtimetalos "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" diff --git a/internal/app/machined/pkg/controllers/runtime/events_sink.go b/internal/app/machined/pkg/controllers/runtime/events_sink.go index c68c3168b..817343917 100644 --- a/internal/app/machined/pkg/controllers/runtime/events_sink.go +++ b/internal/app/machined/pkg/controllers/runtime/events_sink.go @@ -13,8 +13,8 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/rs/xid" "github.com/siderolabs/go-pointer" + "github.com/siderolabs/siderolink/api/events" "github.com/talos-systems/go-procfs/procfs" - "github.com/talos-systems/siderolink/api/events" "go.uber.org/atomic" "go.uber.org/zap" "google.golang.org/grpc" diff --git a/internal/app/machined/pkg/controllers/runtime/events_sink_test.go b/internal/app/machined/pkg/controllers/runtime/events_sink_test.go index 6e4b78fc4..85290ceeb 100644 --- a/internal/app/machined/pkg/controllers/runtime/events_sink_test.go +++ b/internal/app/machined/pkg/controllers/runtime/events_sink_test.go @@ -17,11 +17,11 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/cosi-project/runtime/pkg/state/impl/inmem" "github.com/cosi-project/runtime/pkg/state/impl/namespaced" + eventsapi "github.com/siderolabs/siderolink/api/events" + "github.com/siderolabs/siderolink/pkg/events" "github.com/stretchr/testify/suite" "github.com/talos-systems/go-procfs/procfs" "github.com/talos-systems/go-retry/retry" - eventsapi "github.com/talos-systems/siderolink/api/events" - "github.com/talos-systems/siderolink/pkg/events" "golang.org/x/sync/errgroup" "google.golang.org/grpc" diff --git a/internal/app/machined/pkg/controllers/runtime/kmsg_log_test.go b/internal/app/machined/pkg/controllers/runtime/kmsg_log_test.go index ed0bebb48..045f92c33 100644 --- a/internal/app/machined/pkg/controllers/runtime/kmsg_log_test.go +++ b/internal/app/machined/pkg/controllers/runtime/kmsg_log_test.go @@ -9,6 +9,7 @@ import ( "fmt" "log" "net" + "net/netip" "sync" "testing" "time" @@ -17,11 +18,10 @@ import ( "github.com/cosi-project/runtime/pkg/state" "github.com/cosi-project/runtime/pkg/state/impl/inmem" "github.com/cosi-project/runtime/pkg/state/impl/namespaced" + "github.com/siderolabs/siderolink/pkg/logreceiver" "github.com/stretchr/testify/suite" "github.com/talos-systems/go-procfs/procfs" "github.com/talos-systems/go-retry/retry" - "github.com/talos-systems/siderolink/pkg/logreceiver" - "inet.af/netaddr" controllerruntime "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/runtime" talosruntime "github.com/talos-systems/talos/internal/app/machined/pkg/runtime" @@ -36,7 +36,7 @@ type logHandler struct { } // HandleLog implements logreceiver.Handler. -func (s *logHandler) HandleLog(srcAddr netaddr.IP, msg map[string]interface{}) { +func (s *logHandler) HandleLog(srcAddr netip.Addr, msg map[string]interface{}) { s.mu.Lock() defer s.mu.Unlock() diff --git a/internal/app/machined/pkg/controllers/siderolink/manager.go b/internal/app/machined/pkg/controllers/siderolink/manager.go index 16ff2f7d8..c8335bab9 100644 --- a/internal/app/machined/pkg/controllers/siderolink/manager.go +++ b/internal/app/machined/pkg/controllers/siderolink/manager.go @@ -17,8 +17,8 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/go-pointer" + pb "github.com/siderolabs/siderolink/api/siderolink" "github.com/talos-systems/go-procfs/procfs" - pb "github.com/talos-systems/siderolink/api/siderolink" "go.uber.org/zap" "golang.zx2c4.com/wireguard/wgctrl/wgtypes" "google.golang.org/grpc" diff --git a/internal/app/machined/pkg/controllers/siderolink/manager_test.go b/internal/app/machined/pkg/controllers/siderolink/manager_test.go index d94791764..573b65975 100644 --- a/internal/app/machined/pkg/controllers/siderolink/manager_test.go +++ b/internal/app/machined/pkg/controllers/siderolink/manager_test.go @@ -15,11 +15,11 @@ import ( "github.com/cosi-project/runtime/pkg/resource" "github.com/cosi-project/runtime/pkg/state" "github.com/siderolabs/go-pointer" + pb "github.com/siderolabs/siderolink/api/siderolink" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/suite" "github.com/talos-systems/go-procfs/procfs" "github.com/talos-systems/go-retry/retry" - pb "github.com/talos-systems/siderolink/api/siderolink" "google.golang.org/grpc" "github.com/talos-systems/talos/internal/app/machined/pkg/controllers/ctest" diff --git a/internal/pkg/smbios/smbios.go b/internal/pkg/smbios/smbios.go index 79aee4d43..72c607cd3 100644 --- a/internal/pkg/smbios/smbios.go +++ b/internal/pkg/smbios/smbios.go @@ -7,7 +7,7 @@ package smbios import ( "sync" - "github.com/talos-systems/go-smbios/smbios" + "github.com/siderolabs/go-smbios/smbios" ) var ( diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index 0d8731a8c..ed876992a 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -17,7 +17,7 @@ require ( github.com/mdlayher/ethtool v0.0.0-20220830195143-0e16326d06d1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/siderolabs/crypto v0.4.0 - github.com/siderolabs/gen v0.2.0 + github.com/siderolabs/gen v0.3.0 github.com/siderolabs/go-blockdevice v0.4.0 github.com/siderolabs/go-pointer v1.0.0 github.com/siderolabs/protoenc v0.2.0 @@ -25,7 +25,7 @@ require ( github.com/talos-systems/go-debug v0.2.1 github.com/talos-systems/net v0.3.2 go4.org/netipx v0.0.0-20220925034521-797b0c90d8ab - google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc + google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 google.golang.org/grpc v1.49.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index b5bebf21c..6081cd284 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -103,8 +103,8 @@ github.com/ryanuber/go-glob v1.0.0 h1:iQh3xXAumdQ+4Ufa5b25cRpC5TYKlno6hsv6Cb3pkB github.com/ryanuber/go-glob v1.0.0/go.mod h1:807d1WSdnB0XRJzKNil9Om6lcp/3a0v4qIHxIXzX/Yc= github.com/siderolabs/crypto v0.4.0 h1:o1KIR1KyevUcY9nbJlSyQAj7+p+rveGGF8LjAAFMtjc= github.com/siderolabs/crypto v0.4.0/go.mod h1:itZpBsJ9i0aH8jiHAuSlKCal7hni7X1aDYo6vGVl5LY= -github.com/siderolabs/gen v0.2.0 h1:Fq+lXJmry1C+bMvp9IipyHX4nUq4j132BrpuV1vWbd8= -github.com/siderolabs/gen v0.2.0/go.mod h1:vzcXVRNpo9j2tyQJU+9ZQ1J6yoebX9KL1TkHt18HNqw= +github.com/siderolabs/gen v0.3.0 h1:tMWVK9+EEXhGdGYTCuox0Bb4kpRjJzx7aUn4Txzw2GE= +github.com/siderolabs/gen v0.3.0/go.mod h1:vzcXVRNpo9j2tyQJU+9ZQ1J6yoebX9KL1TkHt18HNqw= github.com/siderolabs/go-blockdevice v0.4.0 h1:b+5b4Lu35U6MFXQDE2g0hAW6pTqkJypPF8WbktbbXlQ= github.com/siderolabs/go-blockdevice v0.4.0/go.mod h1:viu/gYeRpdr41UcR39SjlFr4vID4WyaIuGd8lOKuyA4= github.com/siderolabs/go-pointer v1.0.0 h1:6TshPKep2doDQJAAtHUuHWXbca8ZfyRySjSBT/4GsMU= @@ -193,8 +193,8 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc h1:saaNe2+SBQxandnzcD/qB1JEBQ2Pqew+KlFLLdA/XcM= -google.golang.org/genproto v0.0.0-20220923205249-dd2d53f1fffc/go.mod h1:yEEpwVWKMZZzo81NwRgyEJnA2fQvpXAYPVisv8EgDVs= +google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91 h1:Ezh2cpcnP5Rq60sLensUsFnxh7P6513NLvNtCm9iyJ4= +google.golang.org/genproto v0.0.0-20220930163606-c98284e70a91/go.mod h1:3526vdqwhZAwq4wsRUaVG555sVgsNmIjRtO7t/JH29U= google.golang.org/grpc v1.49.0 h1:WTLtQzmQori5FUH25Pq4WT22oCsv8USpQ+F6rqtsmxw= google.golang.org/grpc v1.49.0/go.mod h1:ZgQEeidpAuNRZ8iRrlBKXZQP1ghovWIVhdJRyCDK+GI= google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=