feat: update Talos to 1.2.0-beta.2

Packages, tools, etc.

Signed-off-by: Andrey Smirnov <[email protected]>

Dockerfile

@@ -43,9 +43,10 @@ ENV CGO_ENABLED ${CGO_ENABLED}
 ENV GOCACHE /.cache/go-build
 ENV GOMODCACHE /.cache/mod
 RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/[email protected]
-RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.23.1
+RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.24.2
 RUN --mount=type=cache,target=/.cache go install mvdan.cc/gofumpt/[email protected]
-RUN curl -sfL https://raw.githubusercontent.com/golangci/golangci-lint/v1.47.2/install.sh | bash -s -- -b /toolchain/bin v1.47.2
+RUN go install github.com/golangci/golangci-lint/cmd/[email protected] \
+	&& mv /go/bin/golangci-lint /toolchain/bin/golangci-lint
 WORKDIR /src
 COPY ./go.mod ./
 COPY ./go.sum ./
@@ -87,7 +88,7 @@ COPY --from=generate-build /src/app/caps-controller-manager/api ./app/caps-contr
 COPY --from=generate-build /src/app/sidero-controller-manager/api ./app/sidero-controller-manager/api
 COPY --from=generate-build /src/app/sidero-controller-manager/internal/api ./app/sidero-controller-manager/internal/api
 
-FROM --platform=${BUILDPLATFORM} alpine:3.15.4 AS release-build
+FROM --platform=${BUILDPLATFORM} alpine:3.16.2 AS release-build
 ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2Fv4.1.0/kustomize_v4.1.0_linux_amd64.tar.gz .
 RUN  tar -xf kustomize_v4.1.0_linux_amd64.tar.gz -C /usr/local/bin && rm kustomize_v4.1.0_linux_amd64.tar.gz
 COPY ./config ./config
@@ -253,7 +254,7 @@ COPY --from=fmt-build /src /
 #
 # The markdownlint target performs linting on Markdown files.
 #
-FROM node:18.0.0-alpine AS lint-markdown
+FROM node:18.8.0-alpine AS lint-markdown
 RUN apk add --no-cache findutils
 RUN npm i -g [email protected]
 RUN npm i -g [email protected]

Makefile

@@ -9,12 +9,12 @@ MODULE := $(shell head -1 go.mod | cut -d' ' -f2)
 
 ARTIFACTS := _out
 TEST_PKGS ?= ./...
-TALOS_RELEASE ?= v1.1.1
+TALOS_RELEASE ?= v1.2.0-beta.2
 PREVIOUS_TALOS_RELEASE ?= v0.13.4
-DEFAULT_K8S_VERSION ?= v1.24.2
+DEFAULT_K8S_VERSION ?= v1.25.0
 
-TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-2-g9edfc1f
-PKGS ?= v1.1.0-alpha.0-17-g4dace49
+TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
+PKGS ?= v1.2.0
 
 SFYRA_CLUSTERCTL_CONFIG ?= $(HOME)/.cluster-api/clusterctl.sfyra.yaml
 

README.md

@@ -20,19 +20,19 @@ This provider's versions are compatible with the following versions of Cluster A
 
 This provider's versions are able to install and manage the following versions of Kubernetes:
 
-|                        | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
-| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.3) | ✓     | ✓      | ✓     | ✓     | ✓     | ✓     |       |       |       |
-| Sidero Provider (v0.4) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |       |
-| Sidero Provider (v0.5) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                        | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
+| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.3) | ✓     | ✓      | ✓     | ✓     | ✓     | ✓     |       |       |       |       |
+| Sidero Provider (v0.4) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |       |       |
+| Sidero Provider (v0.5) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 This provider's versions are compatible with the following versions of Talos:
 
-|                        | v0.11 | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  |
-| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- |
-| Sidero Provider (v0.3) | ✓     | ✓      |       |       |       |       |
-| Sidero Provider (v0.4) | ✓     | ✓      | ✓     | ✓     |       |       |
-| Sidero Provider (v0.5) |       | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     |
+|                        | v0.11 | v0.12  | v0.13 | v0.14 | v1.0  | v1.1  | v1.2  |
+| ---------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
+| Sidero Provider (v0.3) | ✓     | ✓      |       |       |       |       |       |
+| Sidero Provider (v0.4) | ✓     | ✓      | ✓     | ✓     |       |       |       |
+| Sidero Provider (v0.5) |       | ✓ (+)  | ✓ (+) | ✓     | ✓     | ✓     | ✓     |
 
 > (+): Some Sidero 0.5 features (SideroLink) are only available with Talos v0.14+.
 

app/sidero-controller-manager/internal/power/api/api.go

@@ -10,7 +10,6 @@ import (
 	"encoding/json"
 	"fmt"
 	"io"
-	"io/ioutil"
 	"net/http"
 	"time"
 
@@ -61,7 +60,7 @@ func (c *Client) postRequest(path string) error {
 
 	if resp.Body != nil {
 		defer func() {
-			_, _ = io.Copy(ioutil.Discard, resp.Body)
+			_, _ = io.Copy(io.Discard, resp.Body)
 			resp.Body.Close()
 		}()
 	}
@@ -120,7 +119,7 @@ func (c *Client) IsPoweredOn() (bool, error) {
 
 	if resp.Body != nil {
 		defer func() {
-			_, _ = io.Copy(ioutil.Discard, resp.Body)
+			_, _ = io.Copy(io.Discard, resp.Body)
 			resp.Body.Close()
 		}()
 	}

app/sidero-controller-manager/internal/power/ipmi/ipmi.go

@@ -151,9 +151,10 @@ func (c *Client) GetUserSummary() (*goipmi.GetUserSummaryResponse, error) {
 }
 
 // GetUserName fetches a un string given a uid. This is how we check if a user slot is available.
+//
 // nb: a "failure" here can actually mean that the slot is just open for use
-//     or you can also have a user with "" as the name which won't
-//     fail this check and is still open for use.
+// or you can also have a user with "" as the name which won't
+// fail this check and is still open for use.
 // (see 22.29).
 func (c *Client) GetUserName(uid byte) (*goipmi.GetUserNameResponse, error) {
 	req := &goipmi.Request{
@@ -197,7 +198,8 @@ func (c *Client) SetUserName(uid byte, name string) (*goipmi.SetUserNameResponse
 
 // SetUserPass sets the password for a given uid (see 22.30).
 // nb: This naively assumes you'll pass a 16 char or less pw string.
-//     The goipmi function does not support longer right now.
+//
+//	The goipmi function does not support longer right now.
 func (c *Client) SetUserPass(uid byte, pass string) (*goipmi.SetUserPassResponse, error) {
 	req := &goipmi.Request{
 		NetworkFunction: goipmi.NetworkFunctionApp,

go.mod

@@ -1,6 +1,6 @@
 module github.com/talos-systems/sidero
 
-go 1.18
+go 1.19
 
 replace github.com/pensando/goipmi v0.0.0-20200303170213-e858ec1cf0b5 => github.com/talos-systems/goipmi v0.0.0-20211214143420-35f956689e67
 
@@ -16,7 +16,7 @@ require (
 	github.com/pensando/goipmi v0.0.0-20200303170213-e858ec1cf0b5
 	github.com/pin/tftp v2.1.1-0.20200117065540-2f79be2dba4e+incompatible
 	github.com/pkg/errors v0.9.1
-	github.com/stretchr/testify v1.7.1
+	github.com/stretchr/testify v1.8.0
 	github.com/talos-systems/go-blockdevice v0.3.4
 	github.com/talos-systems/go-debug v0.2.1
 	github.com/talos-systems/go-kmsg v0.1.1
@@ -26,94 +26,104 @@ require (
 	github.com/talos-systems/grpc-proxy v0.3.0
 	github.com/talos-systems/net v0.3.2
 	github.com/talos-systems/siderolink v0.1.1-0.20211130121818-9902ad2774f0
-	github.com/talos-systems/talos/pkg/machinery v1.1.1
-	go.uber.org/zap v1.21.0
-	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
-	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29
-	golang.org/x/sys v0.0.0-20220502124256-b6088ccd6cba
+	github.com/talos-systems/talos/pkg/machinery v1.2.0-beta.2
+	go.uber.org/zap v1.23.0
+	golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced
+	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
+	golang.org/x/sys v0.0.0-20220808155132-1c4a2a72c664
 	golang.zx2c4.com/wireguard/wgctrl v0.0.0-20220330030906-9490840b0b01
-	google.golang.org/grpc v1.46.2
-	google.golang.org/protobuf v1.28.0
-	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
-	k8s.io/api v0.23.6
-	k8s.io/apiextensions-apiserver v0.23.6
-	k8s.io/apimachinery v0.23.6
-	k8s.io/client-go v0.23.6
+	google.golang.org/grpc v1.49.0
+	google.golang.org/protobuf v1.28.1
+	inet.af/netaddr v0.0.0-20220811202034-502d2d690317
+	k8s.io/api v0.24.2
+	k8s.io/apiextensions-apiserver v0.24.2
+	k8s.io/apimachinery v0.24.2
+	k8s.io/client-go v0.24.2
 	k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
-	sigs.k8s.io/cluster-api v1.1.5
-	sigs.k8s.io/controller-runtime v0.11.2
+	sigs.k8s.io/cluster-api v1.2.1
+	sigs.k8s.io/controller-runtime v0.12.3
 )
 
 require (
 	cloud.google.com/go v0.93.3 // indirect
+	github.com/PuerkitoBio/purell v1.1.1 // indirect
+	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
 	github.com/blang/semver v3.5.1+incompatible // indirect
-	github.com/cespare/xxhash/v2 v2.1.1 // indirect
-	github.com/containerd/go-cni v1.1.5 // indirect
-	github.com/containernetworking/cni v1.1.0 // indirect
-	github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
+	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	github.com/containerd/go-cni v1.1.7 // indirect
+	github.com/containernetworking/cni v1.1.2 // indirect
+	github.com/cosi-project/runtime v0.1.1 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/digitalocean/go-smbios v0.0.0-20180907143718-390a4f403a8e // indirect
 	github.com/dustin/go-humanize v1.0.0 // indirect
-	github.com/fsnotify/fsnotify v1.5.1 // indirect
+	github.com/emicklei/go-restful v2.15.0+incompatible // indirect
+	github.com/fsnotify/fsnotify v1.5.4 // indirect
 	github.com/gertd/go-pluralize v0.2.1 // indirect
 	github.com/go-logr/zapr v1.2.0 // indirect
-	github.com/gobuffalo/flect v0.2.4 // indirect
+	github.com/go-openapi/jsonpointer v0.19.5 // indirect
+	github.com/go-openapi/jsonreference v0.19.5 // indirect
+	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/gobuffalo/flect v0.2.5 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
+	github.com/google/gnostic v0.5.7-v3refs // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/uuid v1.3.0 // indirect
-	github.com/googleapis/gnostic v0.5.5 // indirect
-	github.com/hashicorp/errwrap v1.0.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect
+	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
+	github.com/josharian/intern v1.0.0 // indirect
 	github.com/josharian/native v1.0.0 // indirect
-	github.com/jsimonetti/rtnetlink v1.2.0 // indirect
+	github.com/jsimonetti/rtnetlink v1.2.2 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
+	github.com/mailru/easyjson v0.7.6 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
 	github.com/mdlayher/ethtool v0.0.0-20220213132912-856bd6cb8a38 // indirect
 	github.com/mdlayher/genetlink v1.2.0 // indirect
 	github.com/mdlayher/netlink v1.6.0 // indirect
 	github.com/mdlayher/socket v0.2.3 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
+	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
 	github.com/nxadm/tail v1.4.8 // indirect
 	github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	github.com/prometheus/client_golang v1.11.0 // indirect
+	github.com/prometheus/client_golang v1.12.1 // indirect
 	github.com/prometheus/client_model v0.2.0 // indirect
-	github.com/prometheus/common v0.28.0 // indirect
-	github.com/prometheus/procfs v0.7.2 // indirect
+	github.com/prometheus/common v0.32.1 // indirect
+	github.com/prometheus/procfs v0.7.3 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/siderolabs/go-pointer v1.0.0 // indirect
+	github.com/siderolabs/protoenc v0.1.3 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/objx v0.3.0 // indirect
-	github.com/talos-systems/crypto v0.3.5 // indirect
-	go.uber.org/atomic v1.7.0 // indirect
-	go.uber.org/multierr v1.7.0 // indirect
-	go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
+	github.com/talos-systems/crypto v0.3.6 // indirect
+	go.uber.org/atomic v1.9.0 // 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/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
+	golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
 	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
 	golang.zx2c4.com/go118/netip v0.0.0-20211111135330-a4a02eeacf9d // indirect
 	golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 // indirect
 	golang.zx2c4.com/wireguard v0.0.0-20220202223031-3b95c81cc178 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
+	google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
-	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/cluster-bootstrap v0.23.0 // indirect
-	k8s.io/component-base v0.23.6 // indirect
-	k8s.io/klog/v2 v2.30.0 // indirect
-	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
+	gopkg.in/yaml.v3 v3.0.1 // indirect
+	k8s.io/cluster-bootstrap v0.24.0 // indirect
+	k8s.io/component-base v0.24.2 // indirect
+	k8s.io/klog/v2 v2.60.1 // indirect
+	k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
+	sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )