feat: bump Talos to 1.1.0

Also update CAPI to the latest 1.1.4.

Signed-off-by: Andrey Smirnov <[email protected]>
(cherry picked from commit 2f3b21f)

Author: smira

Makefile

@@ -9,13 +9,13 @@ NAME := cluster-api-talos-controller
 ARTIFACTS := _out
 TEST_RUN ?= ./...
 
-TOOLS ?= ghcr.io/siderolabs/tools:v1.0.0
-PKGS ?= v1.0.0
-TALOS_VERSION ?= v1.0.0
-K8S_VERSION ?= 1.23.5
+TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-1-g134974c
+PKGS ?= v1.1.0-8-gfa9a488
+TALOS_VERSION ?= v1.1.0
+K8S_VERSION ?= 1.24.2
 
 CONTROLLER_GEN_VERSION ?= v0.8.0
-CONVERSION_GEN_VERSION ?= v0.23.1
+CONVERSION_GEN_VERSION ?= v0.23.5
 
 BUILD := docker buildx build
 PLATFORM ?= linux/amd64

README.md

@@ -55,19 +55,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 |
-| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- |
-| CABPT (v0.3.x) | ✓     | ✓      | ✓     | ✓     | ✓     | ✓     |       |       |
-| CABPT (v0.4.x) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |
-| CABPT (v0.5.x) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |
+|                | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
+| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
+| CABPT (v0.3.x) | ✓     | ✓      | ✓     | ✓     | ✓     | ✓     |       |       |       |
+| CABPT (v0.4.x) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     |       |
+| CABPT (v0.5.x) |       |        |       | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 This provider's versions are compatible with the following versions of Talos:
 
-|                  | v0.11 | v0.12 | v0.13 | v0.14 |
-| ---------------- | ----- | ----- | ----- | ----- |
-| CABPT (v0.3.x)   | ✓     | ✓     | ✓     |       |
-| CABPT (v0.4.x)   | ✓     | ✓     | ✓     | ✓     |
-| CABPT (v0.5.x)   | ✓     | ✓     | ✓     | ✓     |
+|                  | v0.11 | v0.12 | v0.13 | v0.14 | v1.0  | v1.1  |
+| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- |
+| CABPT (v0.3.x)   | ✓     | ✓     | ✓     |       |       |       |
+| CABPT (v0.4.x)   | ✓     | ✓     | ✓     | ✓     |       |       |
+| CABPT (v0.5.x)   | ✓     | ✓     | ✓     | ✓     | ✓     | ✓     |
 
 CABPT generates machine configuration compatible with Talos version specified in the `talosVersion:` field (see below).
 
@@ -85,7 +85,7 @@ spec:
   controlPlaneConfig:
     controlplane:
       generateType: controlplane
-      talosVersion: v0.14
+      talosVersion: v1.1
   ...
 ```
 
@@ -98,7 +98,7 @@ spec:
   template:
     spec:
       generateType: worker
-      talosVersion: v0.14
+      talosVersion: v1.1
 ```
 
 Fields available in the `TalosConfigTemplate` (and `TalosConfig`) resources:
@@ -121,7 +121,7 @@ Machine configuration generated is compatible with the Talos version set in the
 ```yaml
 spec:
   generateType: controlplane
-  talosVersion: v0.14
+  talosVersion: v1.1
 ```
 
 ### User-supplied Machine Configuration

go.mod

@@ -1,24 +1,25 @@
 module github.com/talos-systems/cluster-api-bootstrap-provider-talos
 
-go 1.17
+go 1.18
 
 require (
 	github.com/AlekSi/pointer v1.2.0
 	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/go-logr/logr v1.2.0
+	github.com/google/go-cmp v0.5.7
 	github.com/spf13/pflag v1.0.5
-	github.com/stretchr/testify v1.7.0
+	github.com/stretchr/testify v1.7.1
 	github.com/talos-systems/crypto v0.3.5
-	github.com/talos-systems/talos/pkg/machinery v1.0.0
-	golang.org/x/sys v0.0.0-20220209214540-3681064d5158
+	github.com/talos-systems/talos/pkg/machinery v1.1.0
+	golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f
 	gopkg.in/yaml.v2 v2.4.0
 	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
-	k8s.io/api v0.23.0
-	k8s.io/apiextensions-apiserver v0.23.0
-	k8s.io/apimachinery v0.23.0
-	k8s.io/client-go v0.23.0
-	sigs.k8s.io/cluster-api v1.1.3
-	sigs.k8s.io/controller-runtime v0.11.1
+	k8s.io/api v0.23.5
+	k8s.io/apiextensions-apiserver v0.23.5
+	k8s.io/apimachinery v0.23.5
+	k8s.io/client-go v0.23.5
+	sigs.k8s.io/cluster-api v1.1.4
+	sigs.k8s.io/controller-runtime v0.11.2
 )
 
 require (
@@ -33,11 +34,11 @@ require (
 	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.3 // indirect
-	github.com/containernetworking/cni v1.0.1 // indirect
+	github.com/containerd/go-cni v1.1.5 // indirect
+	github.com/containernetworking/cni v1.1.0 // indirect
 	github.com/coredns/caddy v1.1.0 // indirect
 	github.com/coredns/corefile-migration v1.0.14 // indirect
-	github.com/cosi-project/runtime v0.0.0-20211216175730-264f8fcd1a4f // indirect
+	github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/docker/distribution v2.7.1+incompatible // indirect
 	github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -54,7 +55,6 @@ require (
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2 // indirect
 	github.com/google/cel-go v0.9.0 // indirect
-	github.com/google/go-cmp v0.5.7 // indirect
 	github.com/google/go-github/v33 v33.0.0 // indirect
 	github.com/google/go-querystring v1.0.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -67,7 +67,7 @@ require (
 	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.1.0 // indirect
+	github.com/jsimonetti/rtnetlink v1.2.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
@@ -93,44 +93,45 @@ require (
 	github.com/prometheus/procfs v0.6.0 // indirect
 	github.com/ryanuber/go-glob v1.0.0 // indirect
 	github.com/shopspring/decimal v1.2.0 // indirect
+	github.com/siderolabs/go-pointer v1.0.0 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.4.1 // indirect
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/viper v1.9.0 // indirect
 	github.com/stoewer/go-strcase v1.2.0 // indirect
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/talos-systems/go-blockdevice v0.3.1 // indirect
+	github.com/talos-systems/go-blockdevice v0.3.2 // indirect
 	github.com/talos-systems/go-debug v0.2.1 // indirect
 	github.com/talos-systems/net v0.3.2 // indirect
 	github.com/valyala/fastjson v1.6.3 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
-	go.uber.org/zap v1.19.1 // indirect
+	go.uber.org/zap v1.21.0 // 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-20210817164053-32db794688a5 // indirect
 	golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
 	golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
-	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
+	golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // 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
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20220228155957-1da8797a5878 // indirect
-	google.golang.org/grpc v1.44.0 // indirect
-	google.golang.org/protobuf v1.27.1 // indirect
+	google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
+	google.golang.org/grpc v1.46.2 // indirect
+	google.golang.org/protobuf v1.28.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/ini.v1 v1.63.2 // indirect
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
-	k8s.io/apiserver v0.23.0 // indirect
+	k8s.io/apiserver v0.23.5 // indirect
 	k8s.io/cluster-bootstrap v0.23.0 // indirect
-	k8s.io/component-base v0.23.0 // indirect
+	k8s.io/component-base v0.23.5 // indirect
 	k8s.io/klog/v2 v2.30.0 // indirect
 	k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
-	k8s.io/utils v0.0.0-20210930125809-cb0fa318a74b // indirect
+	k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
 	sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
-	sigs.k8s.io/structured-merge-diff/v4 v4.2.0 // indirect
+	sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
 	sigs.k8s.io/yaml v1.3.0 // indirect
 )