Skip to content

Commit e79b3c0

Browse files
smirasmira
committed
feat: update Talos to 1.2.0-beta.2
Bump core CAPI to 1.2.1 (latest version). Update tools, pkgs, etc. The final bump to 1.2.0 will come after Talos release. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit a7fef2c)
1 parent dbc4c34 commit e79b3c0

11 files changed

+282
-333
lines changed

‎Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ RUN --mount=type=cache,target=/.cache go mod download
3535
RUN --mount=type=cache,target=/.cache go mod verify
3636
COPY ./ ./
3737
RUN --mount=type=cache,target=/.cache go list -mod=readonly all >/dev/null
38-
RUN --mount=type=cache,target=/.cache ! go mod tidy -v 2>&1 | grep .
3938

4039
FROM build AS manifests-build
4140
ARG NAME

‎Makefile‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,13 +9,13 @@ NAME := cluster-api-talos-controller
99
ARTIFACTS := _out
1010
TEST_RUN ?= ./...
1111

12-
TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-1-g134974c
13-
PKGS ?= v1.1.0-8-gfa9a488
14-
TALOS_VERSION ?= v1.1.0
15-
K8S_VERSION ?= 1.24.2
12+
TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
13+
PKGS ?= v1.2.0
14+
TALOS_VERSION ?= v1.2.0-beta.2
15+
K8S_VERSION ?= 1.25.0
1616

17-
CONTROLLER_GEN_VERSION ?= v0.8.0
18-
CONVERSION_GEN_VERSION ?= v0.23.5
17+
CONTROLLER_GEN_VERSION ?= v0.9.1
18+
CONVERSION_GEN_VERSION ?= v0.24.2
1919

2020
BUILD := docker buildx build
2121
PLATFORM ?= linux/amd64

‎README.md‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -55,19 +55,19 @@ This provider's versions are compatible with the following versions of Cluster A
5555

5656
This provider's versions are able to install and manage the following versions of Kubernetes:
5757
58-
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
59-
| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
60-
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
61-
| CABPT (v0.4.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | |
62-
| CABPT (v0.5.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
58+
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
59+
| -------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
60+
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
61+
| CABPT (v0.4.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | | |
62+
| CABPT (v0.5.x) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
6363
6464
This provider's versions are compatible with the following versions of Talos:
6565

66-
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 |
67-
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- |
68-
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | | | |
69-
| CABPT (v0.4.x) | ✓ | ✓ | ✓ | ✓ | | |
70-
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
66+
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 |
67+
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
68+
| CABPT (v0.3.x) | ✓ | ✓ | ✓ | | | | |
69+
| CABPT (v0.4.x) | ✓ | ✓ | ✓ | ✓ | | | |
70+
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
7171

7272
CABPT generates machine configuration compatible with Talos version specified in the `talosVersion:` field (see below).
7373

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigs.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: talosconfigs.bootstrap.cluster.x-k8s.io
99
spec:
@@ -200,9 +200,3 @@ spec:
200200
storage: true
201201
subresources:
202202
status: {}
203-
status:
204-
acceptedNames:
205-
kind: ""
206-
plural: ""
207-
conditions: []
208-
storedVersions: []

‎config/crd/bases/bootstrap.cluster.x-k8s.io_talosconfigtemplates.yaml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1
33
kind: CustomResourceDefinition
44
metadata:
55
annotations:
6-
controller-gen.kubebuilder.io/version: v0.8.0
6+
controller-gen.kubebuilder.io/version: v0.9.1
77
creationTimestamp: null
88
name: talosconfigtemplates.bootstrap.cluster.x-k8s.io
99
spec:
@@ -126,9 +126,3 @@ spec:
126126
storage: true
127127
subresources:
128128
status: {}
129-
status:
130-
acceptedNames:
131-
kind: ""
132-
plural: ""
133-
conditions: []
134-
storedVersions: []

‎go.mod‎

Lines changed: 65 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,24 @@
11
module github.com/talos-systems/cluster-api-bootstrap-provider-talos
22

3-
go 1.18
3+
go 1.19
44

55
require (
6-
github.com/AlekSi/pointer v1.2.0
76
github.com/evanphx/json-patch v5.6.0+incompatible
87
github.com/go-logr/logr v1.2.0
9-
github.com/google/go-cmp v0.5.7
8+
github.com/google/go-cmp v0.5.8
9+
github.com/siderolabs/go-pointer v1.0.0
1010
github.com/spf13/pflag v1.0.5
11-
github.com/stretchr/testify v1.7.1
12-
github.com/talos-systems/crypto v0.3.5
13-
github.com/talos-systems/talos/pkg/machinery v1.1.0
14-
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f
11+
github.com/stretchr/testify v1.8.0
12+
github.com/talos-systems/crypto v0.3.6
13+
github.com/talos-systems/talos/pkg/machinery v1.2.0-beta.2
14+
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261
1515
gopkg.in/yaml.v2 v2.4.0
16-
inet.af/netaddr v0.0.0-20211027220019-c74959edd3b6
17-
k8s.io/api v0.23.5
18-
k8s.io/apiextensions-apiserver v0.23.5
19-
k8s.io/apimachinery v0.23.5
20-
k8s.io/client-go v0.23.5
21-
sigs.k8s.io/cluster-api v1.1.4
22-
sigs.k8s.io/controller-runtime v0.11.2
16+
k8s.io/api v0.24.2
17+
k8s.io/apiextensions-apiserver v0.24.2
18+
k8s.io/apimachinery v0.24.2
19+
k8s.io/client-go v0.24.2
20+
sigs.k8s.io/cluster-api v1.2.1
21+
sigs.k8s.io/controller-runtime v0.12.3
2322
)
2423

2524
require (
@@ -33,105 +32,105 @@ require (
3332
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3433
github.com/beorn7/perks v1.0.1 // indirect
3534
github.com/blang/semver v3.5.1+incompatible // indirect
36-
github.com/cespare/xxhash/v2 v2.1.1 // indirect
37-
github.com/containerd/go-cni v1.1.5 // indirect
38-
github.com/containernetworking/cni v1.1.0 // indirect
35+
github.com/cespare/xxhash/v2 v2.1.2 // indirect
36+
github.com/containerd/go-cni v1.1.7 // indirect
37+
github.com/containernetworking/cni v1.1.2 // indirect
3938
github.com/coredns/caddy v1.1.0 // indirect
40-
github.com/coredns/corefile-migration v1.0.14 // indirect
41-
github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
39+
github.com/coredns/corefile-migration v1.0.17 // indirect
4240
github.com/davecgh/go-spew v1.1.1 // indirect
43-
github.com/docker/distribution v2.7.1+incompatible // indirect
41+
github.com/docker/distribution v2.8.1+incompatible // indirect
4442
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
4543
github.com/dustin/go-humanize v1.0.0 // indirect
44+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
4645
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
47-
github.com/fsnotify/fsnotify v1.5.1 // indirect
46+
github.com/fsnotify/fsnotify v1.5.4 // indirect
4847
github.com/ghodss/yaml v1.0.0 // indirect
4948
github.com/go-logr/zapr v1.2.0 // indirect
5049
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5150
github.com/go-openapi/jsonreference v0.19.5 // indirect
5251
github.com/go-openapi/swag v0.19.14 // indirect
53-
github.com/gobuffalo/flect v0.2.4 // indirect
52+
github.com/gobuffalo/flect v0.2.5 // indirect
5453
github.com/gogo/protobuf v1.3.2 // indirect
5554
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5655
github.com/golang/protobuf v1.5.2 // indirect
57-
github.com/google/cel-go v0.9.0 // indirect
58-
github.com/google/go-github/v33 v33.0.0 // indirect
59-
github.com/google/go-querystring v1.0.0 // indirect
56+
github.com/google/cel-go v0.10.1 // indirect
57+
github.com/google/gnostic v0.5.7-v3refs // indirect
58+
github.com/google/go-github/v45 v45.2.0 // indirect
59+
github.com/google/go-querystring v1.1.0 // indirect
6060
github.com/google/gofuzz v1.2.0 // indirect
61-
github.com/google/uuid v1.1.2 // indirect
62-
github.com/googleapis/gnostic v0.5.5 // indirect
63-
github.com/hashicorp/errwrap v1.0.0 // indirect
61+
github.com/google/uuid v1.2.0 // indirect
62+
github.com/hashicorp/errwrap v1.1.0 // indirect
6463
github.com/hashicorp/go-multierror v1.1.1 // indirect
6564
github.com/hashicorp/hcl v1.0.0 // indirect
6665
github.com/huandu/xstrings v1.3.2 // indirect
6766
github.com/imdario/mergo v0.3.12 // indirect
6867
github.com/josharian/intern v1.0.0 // indirect
6968
github.com/josharian/native v1.0.0 // indirect
70-
github.com/jsimonetti/rtnetlink v1.2.0 // indirect
69+
github.com/jsimonetti/rtnetlink v1.2.2 // indirect
7170
github.com/json-iterator/go v1.1.12 // indirect
72-
github.com/magiconair/properties v1.8.5 // indirect
71+
github.com/magiconair/properties v1.8.6 // indirect
7372
github.com/mailru/easyjson v0.7.6 // indirect
7473
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7574
github.com/mdlayher/ethtool v0.0.0-20220213132912-856bd6cb8a38 // indirect
7675
github.com/mdlayher/genetlink v1.2.0 // indirect
7776
github.com/mdlayher/netlink v1.6.0 // indirect
78-
github.com/mdlayher/socket v0.2.1 // indirect
77+
github.com/mdlayher/socket v0.2.3 // indirect
7978
github.com/mitchellh/copystructure v1.2.0 // indirect
80-
github.com/mitchellh/mapstructure v1.4.2 // indirect
79+
github.com/mitchellh/mapstructure v1.5.0 // indirect
8180
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8281
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8382
github.com/modern-go/reflect2 v1.0.2 // indirect
84-
github.com/onsi/gomega v1.17.0 // indirect
83+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
84+
github.com/onsi/gomega v1.18.1 // indirect
8585
github.com/opencontainers/go-digest v1.0.0 // indirect
8686
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
87-
github.com/pelletier/go-toml v1.9.4 // indirect
87+
github.com/pelletier/go-toml v1.9.5 // indirect
88+
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
8889
github.com/pkg/errors v0.9.1 // indirect
8990
github.com/pmezard/go-difflib v1.0.0 // indirect
90-
github.com/prometheus/client_golang v1.11.0 // indirect
91+
github.com/prometheus/client_golang v1.12.1 // indirect
9192
github.com/prometheus/client_model v0.2.0 // indirect
92-
github.com/prometheus/common v0.28.0 // indirect
93-
github.com/prometheus/procfs v0.6.0 // indirect
93+
github.com/prometheus/common v0.32.1 // indirect
94+
github.com/prometheus/procfs v0.7.3 // indirect
9495
github.com/ryanuber/go-glob v1.0.0 // indirect
9596
github.com/shopspring/decimal v1.2.0 // indirect
96-
github.com/siderolabs/go-pointer v1.0.0 // indirect
97-
github.com/spf13/afero v1.6.0 // indirect
98-
github.com/spf13/cast v1.4.1 // indirect
97+
github.com/spf13/afero v1.8.2 // indirect
98+
github.com/spf13/cast v1.5.0 // indirect
9999
github.com/spf13/jwalterweatherman v1.1.0 // indirect
100-
github.com/spf13/viper v1.9.0 // indirect
100+
github.com/spf13/viper v1.12.0 // indirect
101101
github.com/stoewer/go-strcase v1.2.0 // indirect
102-
github.com/stretchr/objx v0.2.0 // indirect
103-
github.com/subosito/gotenv v1.2.0 // indirect
104-
github.com/talos-systems/go-blockdevice v0.3.2 // indirect
102+
github.com/subosito/gotenv v1.3.0 // indirect
103+
github.com/talos-systems/go-blockdevice v0.3.4 // indirect
105104
github.com/talos-systems/go-debug v0.2.1 // indirect
106105
github.com/talos-systems/net v0.3.2 // indirect
107106
github.com/valyala/fastjson v1.6.3 // indirect
108-
go.uber.org/atomic v1.7.0 // indirect
109-
go.uber.org/multierr v1.7.0 // indirect
110-
go.uber.org/zap v1.21.0 // indirect
111-
go4.org/intern v0.0.0-20211027215823-ae77deb06f29 // indirect
112-
go4.org/unsafe/assume-no-moving-gc v0.0.0-20211027215541-db492cf91b37 // indirect
113-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
114-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
115-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
116-
golang.org/x/sync v0.0.0-20220513210516-0976fa681c29 // indirect
107+
go.uber.org/atomic v1.9.0 // indirect
108+
go.uber.org/multierr v1.8.0 // indirect
109+
go.uber.org/zap v1.22.0 // indirect
110+
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
111+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
112+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
113+
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
114+
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
115+
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 // indirect
117116
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
118117
golang.org/x/text v0.3.7 // indirect
119-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
118+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
120119
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
121120
google.golang.org/appengine v1.6.7 // indirect
122-
google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
123-
google.golang.org/grpc v1.46.2 // indirect
124-
google.golang.org/protobuf v1.28.0 // indirect
121+
google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
122+
google.golang.org/protobuf v1.28.1 // indirect
125123
gopkg.in/inf.v0 v0.9.1 // indirect
126-
gopkg.in/ini.v1 v1.63.2 // indirect
127-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect
128-
k8s.io/apiserver v0.23.5 // indirect
129-
k8s.io/cluster-bootstrap v0.23.0 // indirect
130-
k8s.io/component-base v0.23.5 // indirect
131-
k8s.io/klog/v2 v2.30.0 // indirect
132-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
133-
k8s.io/utils v0.0.0-20211116205334-6203023598ed // indirect
134-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
124+
gopkg.in/ini.v1 v1.66.4 // indirect
125+
gopkg.in/yaml.v3 v3.0.1 // indirect
126+
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
127+
k8s.io/apiserver v0.24.2 // indirect
128+
k8s.io/cluster-bootstrap v0.24.0 // indirect
129+
k8s.io/component-base v0.24.2 // indirect
130+
k8s.io/klog/v2 v2.60.1 // indirect
131+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
132+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9 // indirect
133+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
135134
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
136135
sigs.k8s.io/yaml v1.3.0 // indirect
137136
)

0 commit comments

Comments
 (0)