feat: update Talos to 0.14.0

This includes config generation for 0.14.0 by default.

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

Author: smira

Makefile

@@ -9,10 +9,10 @@ NAME := cluster-api-talos-controller
 ARTIFACTS := _out
 TEST_RUN ?= ./...
 
-TOOLS ?= ghcr.io/talos-systems/tools:v0.8.0
-PKGS ?= v0.8.0
-TALOS_VERSION ?= v0.13.0
-K8S_VERSION ?= 1.22.2
+TOOLS ?= ghcr.io/talos-systems/tools:v0.9.0
+PKGS ?= v0.9.0
+TALOS_VERSION ?= v0.14.0
+K8S_VERSION ?= 1.23.1
 
 CONTROLLER_GEN_VERSION ?= v0.7.0
 CONVERSION_GEN_VERSION ?= v0.22.2

README.md

@@ -32,19 +32,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 |
-| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
-| 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 |
+| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- |
+| 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 |
-| ---------------- | ----- | ----- | ----- |
-| CABPT (v0.3.x)   | ✓     | ✓     | ✓     |
-| CABPT (v0.4.x)   | ✓     | ✓     | ✓     |
-| CABPT (v0.5.x)   | ✓     | ✓     | ✓     |
+|                  | v0.11 | v0.12 | v0.13 | v0.14 |
+| ---------------- | ----- | ----- | ----- | ----- |
+| 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).
 
@@ -62,7 +62,7 @@ spec:
   controlPlaneConfig:
     controlplane:
       generateType: controlplane
-      talosVersion: v0.13
+      talosVersion: v0.14
   ...
 ```
 
@@ -75,13 +75,13 @@ spec:
   template:
     spec:
       generateType: worker
-      talosVersion: v0.13
+      talosVersion: v0.14
 ```
 
 Fields available in the `TalosConfigTemplate` (and `TalosConfig`) resources:
 
 - `generateType`: Talos machine configuration type to generate (`controlplane`, `init` (deprecated), `worker`) or `none` for user-supplied configuration (see below)
-- `talosVersion`: version of Talos to generate machine configuration for (e.g. `v0.13`, patch version might be omitted).
+- `talosVersion`: version of Talos to generate machine configuration for (e.g. `v0.14`, patch version might be omitted).
    CABPT defaults to the latest supported Talos version, but it can generate configuration compatible with previous versions of Talos.
    It is recommended to always set this field explicitly to avoid issues when CABPT is upgraded to the version which supports new Talos version.
 - `configPatches` (optional): set of machine configuration patches to apply to the generated configuration.
@@ -96,7 +96,7 @@ Machine configuration generated is compatible with the Talos version set in the
 ```yaml
 spec:
   generateType: controlplane
-  talosVersion: v0.13
+  talosVersion: v0.14
 ```
 
 ### User-supplied Machine Configuration
@@ -126,7 +126,7 @@ The format of these patches is based on [JSON 6902](http://jsonpatch.com/) that
 ```yaml
 spec:
   generateType: controlplane
-  talosVersion: v0.13
+  talosVersion: v0.14
   configPatches:
     - op: replace
       path: /machine/install

controllers/talosconfig_controller.go

@@ -469,7 +469,6 @@ func (r *TalosConfigReconciler) genConfigs(ctx context.Context, scope *TalosConf
 
 	genOptions := []generate.GenOption{generate.WithDNSDomain(clusterDNS)}
 
-	// default version contract to v0.8 unless user specifies something different.
 	versionContract := defaultVersionContract
 
 	if scope.Config.Spec.TalosVersion != "" {

go.mod

@@ -3,16 +3,16 @@ module github.com/talos-systems/cluster-api-bootstrap-provider-talos
 go 1.17
 
 require (
-	github.com/AlekSi/pointer v1.1.0
-	github.com/evanphx/json-patch v4.11.0+incompatible
+	github.com/AlekSi/pointer v1.2.0
+	github.com/evanphx/json-patch v5.6.0+incompatible
 	github.com/go-logr/logr v0.4.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.7.0
 	github.com/talos-systems/crypto v0.3.4
-	github.com/talos-systems/talos/pkg/machinery v0.13.0
-	golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
+	github.com/talos-systems/talos/pkg/machinery v0.14.0
+	golang.org/x/sys v0.0.0-20211124211545-fe61309f8881
 	gopkg.in/yaml.v2 v2.4.0
-	inet.af/netaddr v0.0.0-20210903134321-85fa6c94624e
+	inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
 	k8s.io/api v0.22.2
 	k8s.io/apiextensions-apiserver v0.22.2
 	k8s.io/apimachinery v0.22.2
@@ -22,6 +22,7 @@ require (
 )
 
 require (
+	github.com/BurntSushi/toml v0.4.1 // indirect
 	github.com/MakeNowJust/heredoc v1.0.0 // indirect
 	github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
@@ -31,7 +32,7 @@ require (
 	github.com/containernetworking/cni v1.0.1 // indirect
 	github.com/coredns/caddy v1.1.0 // indirect
 	github.com/coredns/corefile-migration v1.0.13 // indirect
-	github.com/cosi-project/runtime v0.0.0-20210906201716-5cb7f5002d77 // indirect
+	github.com/cosi-project/runtime v0.0.0-20211216175730-264f8fcd1a4f // 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-20210615175204-7bf45dbf5372 // indirect
@@ -54,14 +55,14 @@ require (
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/imdario/mergo v0.3.12 // indirect
 	github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
-	github.com/jsimonetti/rtnetlink v0.0.0-20210922080037-435639c8e6a8 // indirect
+	github.com/jsimonetti/rtnetlink v0.0.0-20211203074127-fd9a11f42291 // indirect
 	github.com/json-iterator/go v1.1.11 // indirect
 	github.com/magiconair/properties v1.8.5 // indirect
 	github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
-	github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 // indirect
+	github.com/mdlayher/ethtool v0.0.0-20211028163843-288d040e9d60 // indirect
 	github.com/mdlayher/genetlink v1.0.0 // indirect
-	github.com/mdlayher/netlink v1.4.1 // indirect
-	github.com/mdlayher/socket v0.0.0-20210307095302-262dc9984e00 // indirect
+	github.com/mdlayher/netlink v1.4.2 // indirect
+	github.com/mdlayher/socket v0.0.0-20211102153432-57e3fa563ecb // indirect
 	github.com/mitchellh/mapstructure v1.4.2 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.1 // indirect
@@ -81,28 +82,32 @@ require (
 	github.com/spf13/jwalterweatherman v1.1.0 // indirect
 	github.com/spf13/viper v1.9.0 // indirect
 	github.com/subosito/gotenv v1.2.0 // indirect
-	github.com/talos-systems/go-blockdevice v0.2.4 // indirect
+	github.com/talos-systems/go-blockdevice v0.2.5 // indirect
 	github.com/talos-systems/go-debug v0.2.1 // indirect
-	github.com/talos-systems/net v0.3.0 // indirect
+	github.com/talos-systems/net v0.3.1 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
 	go.uber.org/multierr v1.7.0 // indirect
 	go.uber.org/zap v1.19.0 // indirect
-	go4.org/intern v0.0.0-20210108033219-3eb7198706b2 // indirect
-	go4.org/unsafe/assume-no-moving-gc v0.0.0-20201222180813-1025295fd063 // 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-20210525063256-abc453219eb5 // indirect
+	golang.org/x/mod v0.5.1 // indirect
+	golang.org/x/net v0.0.0-20211201190559-0a0e4e1bb54c // indirect
 	golang.org/x/oauth2 v0.0.0-20210819190943-2bc19b11175f // indirect
 	golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect
 	golang.org/x/text v0.3.6 // indirect
 	golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
+	golang.org/x/tools v0.1.7 // indirect
+	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
-	google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 // indirect
-	google.golang.org/grpc v1.41.0 // indirect
+	google.golang.org/genproto v0.0.0-20211203200212-54befc351ae9 // indirect
+	google.golang.org/grpc v1.42.0 // indirect
 	google.golang.org/protobuf v1.27.1 // 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
+	honnef.co/go/tools v0.2.2 // indirect
 	k8s.io/apiserver v0.22.2 // indirect
 	k8s.io/cluster-bootstrap v0.22.2 // indirect
 	k8s.io/component-base v0.22.2 // indirect