Skip to content

Commit 7cd504f

Browse files
smirasmira
committed
feat: update Talos v1.9.0-beta.0
No other major bumps. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 49d8be0 commit 7cd504f

File tree

4 files changed

+136
-132
lines changed

4 files changed

+136
-132
lines changed

‎Makefile‎

Lines changed: 5 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.8.0-1-ga0c06c6
13-
PKGS ?= v1.8.0
14-
TALOS_VERSION ?= v1.8.0
12+
TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0
13+
PKGS ?= v1.9.0
14+
TALOS_VERSION ?= v1.9.0-beta.0
1515
K8S_VERSION ?= 1.30.1
1616

1717
CONTROLLER_GEN_VERSION ?= v0.16.2
18-
CONVERSION_GEN_VERSION ?= v0.31.0
18+
CONVERSION_GEN_VERSION ?= v0.31.3
1919

2020
BUILD := docker buildx build
2121
PLATFORM ?= linux/amd64
@@ -149,8 +149,7 @@ env-up: talosctl ## Start development environment.
149149
--name=cabpt-env \
150150
--kubernetes-version=$(K8S_VERSION) \
151151
--mtu=1450 \
152-
--skip-kubeconfig \
153-
--crashdump
152+
--skip-kubeconfig
154153
./talosctl kubeconfig kubeconfig \
155154
--talosconfig=talosconfig \
156155
--nodes=10.5.0.2 \

‎README.md‎

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

5555
This provider's versions are able to install and manage the following versions of Kubernetes:
5656
57-
| | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 | v1.27 | v1.28 | v1.29 | v1.30 | v1.31 |
58-
| -------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
59-
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | |
60-
| CABPT (v0.6.x) | | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
57+
| | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 | v1.26 | v1.27 | v1.28 | v1.29 | v1.30 | v1.31 | v1.32 |
58+
| -------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
59+
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | | | |
60+
| CABPT (v0.6.x) | | | | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
6161
6262
This provider's versions are compatible with the following versions of Talos:
6363

64-
| | v1.0 | v1.1 | v1.2 | v1.3 | v1.4 | v1.5 | v1.6 | v1.7 | v1.8 |
65-
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
66-
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | | | | | |
67-
| CABPT (v0.6.x) | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
64+
| | v1.0 | v1.1 | v1.2 | v1.3 | v1.4 | v1.5 | v1.6 | v1.7 | v1.8 | v1.9 |
65+
| ---------------- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
66+
| CABPT (v0.5.x) | ✓ | ✓ | ✓ | ✓ | | | | | | |
67+
| CABPT (v0.6.x) | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
6868

6969
> Note: CABPT is not compatible with multi-document Talos Linux machine configuration, as it relies on JSON patch to apply configuration patches.
7070

@@ -84,7 +84,7 @@ spec:
8484
controlPlaneConfig:
8585
controlplane:
8686
generateType: controlplane
87-
talosVersion: v1.6
87+
talosVersion: v1.9
8888
...
8989
```
9090

@@ -97,7 +97,7 @@ spec:
9797
template:
9898
spec:
9999
generateType: worker
100-
talosVersion: v1.6
100+
talosVersion: v1.9
101101
```
102102

103103
Fields available in the `TalosConfigTemplate` (and `TalosConfig`) resources:

‎go.mod‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,47 @@
11
module github.com/siderolabs/cluster-api-bootstrap-provider-talos
22

3-
go 1.22.7
3+
go 1.23.3
44

55
require (
66
github.com/evanphx/json-patch v5.9.0+incompatible
77
github.com/go-logr/logr v1.4.2
88
github.com/google/go-cmp v0.6.0
9-
github.com/siderolabs/crypto v0.4.4
9+
github.com/siderolabs/crypto v0.5.0
1010
github.com/siderolabs/go-pointer v1.0.0
11-
github.com/siderolabs/talos/pkg/machinery v1.8.0
11+
github.com/siderolabs/talos/pkg/machinery v1.9.0-beta.0
1212
github.com/spf13/pflag v1.0.5
13-
github.com/stretchr/testify v1.9.0
14-
golang.org/x/sys v0.25.0
13+
github.com/stretchr/testify v1.10.0
14+
golang.org/x/sys v0.27.0
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.31.1
17-
k8s.io/apiextensions-apiserver v0.31.1
18-
k8s.io/apimachinery v0.31.1
19-
k8s.io/client-go v0.31.1
20-
k8s.io/component-base v0.31.1
16+
k8s.io/api v0.31.3
17+
k8s.io/apiextensions-apiserver v0.31.3
18+
k8s.io/apimachinery v0.31.3
19+
k8s.io/client-go v0.31.3
20+
k8s.io/component-base v0.31.3
2121
k8s.io/klog/v2 v2.130.1
22-
sigs.k8s.io/cluster-api v1.8.3
23-
sigs.k8s.io/controller-runtime v0.19.0
22+
sigs.k8s.io/cluster-api v1.8.5
23+
sigs.k8s.io/controller-runtime v0.19.3
2424
)
2525

2626
require (
27+
cel.dev/expr v0.18.0 // indirect
2728
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2829
github.com/Masterminds/goutils v1.1.1 // indirect
2930
github.com/Masterminds/semver/v3 v3.2.0 // indirect
3031
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
3132
github.com/NYTimes/gziphandler v1.1.1 // indirect
32-
github.com/ProtonMail/go-crypto v1.1.0-alpha.5.0.20240827111422-b5837fa4476e // indirect
33-
github.com/adrg/xdg v0.5.0 // indirect
34-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
33+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
34+
github.com/adrg/xdg v0.5.3 // indirect
35+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
3536
github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a // indirect
3637
github.com/beorn7/perks v1.0.1 // indirect
3738
github.com/blang/semver/v4 v4.0.0 // indirect
3839
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
3940
github.com/cespare/xxhash/v2 v2.3.0 // indirect
40-
github.com/cloudflare/circl v1.3.9 // indirect
41+
github.com/cloudflare/circl v1.5.0 // indirect
4142
github.com/containerd/go-cni v1.1.10 // indirect
4243
github.com/containernetworking/cni v1.2.3 // indirect
44+
github.com/cosi-project/runtime v0.7.2 // indirect
4345
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
4446
github.com/distribution/reference v0.6.0 // indirect
4547
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -49,6 +51,7 @@ require (
4951
github.com/felixge/httpsnoop v1.0.4 // indirect
5052
github.com/fsnotify/fsnotify v1.7.0 // indirect
5153
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
54+
github.com/gertd/go-pluralize v0.2.1 // indirect
5255
github.com/ghodss/yaml v1.0.0 // indirect
5356
github.com/go-logr/stdr v1.2.2 // indirect
5457
github.com/go-logr/zapr v1.3.0 // indirect
@@ -59,13 +62,13 @@ require (
5962
github.com/gogo/protobuf v1.3.2 // indirect
6063
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6164
github.com/golang/protobuf v1.5.4 // indirect
62-
github.com/google/cel-go v0.21.0 // indirect
65+
github.com/google/cel-go v0.22.1 // indirect
6366
github.com/google/gnostic-models v0.6.8 // indirect
6467
github.com/google/go-github/v53 v53.2.0 // indirect
6568
github.com/google/go-querystring v1.1.0 // indirect
6669
github.com/google/gofuzz v1.2.0 // indirect
6770
github.com/google/uuid v1.6.0 // indirect
68-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
71+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
6972
github.com/hashicorp/errwrap v1.1.0 // indirect
7073
github.com/hashicorp/go-multierror v1.1.1 // indirect
7174
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -78,7 +81,7 @@ require (
7881
github.com/json-iterator/go v1.1.12 // indirect
7982
github.com/magiconair/properties v1.8.7 // indirect
8083
github.com/mailru/easyjson v0.7.7 // indirect
81-
github.com/mdlayher/ethtool v0.1.0 // indirect
84+
github.com/mdlayher/ethtool v0.2.0 // indirect
8285
github.com/mdlayher/genetlink v1.3.2 // indirect
8386
github.com/mdlayher/netlink v1.7.2 // indirect
8487
github.com/mdlayher/socket v0.5.1 // indirect
@@ -93,7 +96,7 @@ require (
9396
github.com/opencontainers/runtime-spec v1.2.0 // indirect
9497
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
9598
github.com/pkg/errors v0.9.1 // indirect
96-
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
99+
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 // indirect
97100
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
98101
github.com/prometheus/client_golang v1.19.1 // indirect
99102
github.com/prometheus/client_model v0.6.1 // indirect
@@ -103,17 +106,16 @@ require (
103106
github.com/sagikazarmark/locafero v0.4.0 // indirect
104107
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
105108
github.com/shopspring/decimal v1.3.1 // indirect
106-
github.com/siderolabs/gen v0.5.0 // indirect
107-
github.com/siderolabs/go-blockdevice v0.4.7 // indirect
108-
github.com/siderolabs/go-blockdevice/v2 v2.0.2 // indirect
109+
github.com/siderolabs/gen v0.7.0 // indirect
110+
github.com/siderolabs/go-blockdevice/v2 v2.0.6 // indirect
109111
github.com/siderolabs/net v0.4.0 // indirect
110112
github.com/siderolabs/protoenc v0.2.1 // indirect
111113
github.com/sourcegraph/conc v0.3.0 // indirect
112114
github.com/spf13/afero v1.11.0 // indirect
113115
github.com/spf13/cast v1.6.0 // indirect
114116
github.com/spf13/cobra v1.8.1 // indirect
115117
github.com/spf13/viper v1.19.0 // indirect
116-
github.com/stoewer/go-strcase v1.2.0 // indirect
118+
github.com/stoewer/go-strcase v1.3.0 // indirect
117119
github.com/subosito/gotenv v1.6.0 // indirect
118120
github.com/valyala/fastjson v1.6.4 // indirect
119121
github.com/x448/float16 v0.8.4 // indirect
@@ -127,24 +129,24 @@ require (
127129
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
128130
go.uber.org/multierr v1.11.0 // indirect
129131
go.uber.org/zap v1.27.0 // indirect
130-
golang.org/x/crypto v0.26.0 // indirect
131-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
132-
golang.org/x/net v0.28.0 // indirect
133-
golang.org/x/oauth2 v0.22.0 // indirect
134-
golang.org/x/sync v0.8.0 // indirect
135-
golang.org/x/term v0.23.0 // indirect
136-
golang.org/x/text v0.17.0 // indirect
137-
golang.org/x/time v0.6.0 // indirect
132+
golang.org/x/crypto v0.29.0 // indirect
133+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
134+
golang.org/x/net v0.31.0 // indirect
135+
golang.org/x/oauth2 v0.24.0 // indirect
136+
golang.org/x/sync v0.9.0 // indirect
137+
golang.org/x/term v0.26.0 // indirect
138+
golang.org/x/text v0.20.0 // indirect
139+
golang.org/x/time v0.8.0 // indirect
138140
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
139-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
140-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
141-
google.golang.org/grpc v1.66.0 // indirect
142-
google.golang.org/protobuf v1.34.2 // indirect
141+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
142+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
143+
google.golang.org/grpc v1.68.0 // indirect
144+
google.golang.org/protobuf v1.35.2 // indirect
143145
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
144146
gopkg.in/inf.v0 v0.9.1 // indirect
145147
gopkg.in/ini.v1 v1.67.0 // indirect
146148
gopkg.in/yaml.v3 v3.0.1 // indirect
147-
k8s.io/apiserver v0.31.1 // indirect
149+
k8s.io/apiserver v0.31.3 // indirect
148150
k8s.io/cluster-bootstrap v0.30.3 // indirect
149151
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
150152
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect

0 commit comments

Comments
 (0)