Skip to content

Commit d25c6a4

Browse files
smirasmira
committed
feat: update Talos to 1.4.0
Also update CAPI dependencies to the latest version. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent d3adcdb commit d25c6a4

File tree

9 files changed

+114
-117
lines changed

9 files changed

+114
-117
lines changed

‎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.4.0-alpha.0-26-g2d710f9
13-
PKGS ?= v1.4.0-alpha.0-36-g5d77814
14-
TALOS_VERSION ?= v1.4.0-alpha.3
15-
K8S_VERSION ?= 1.27.0-rc.0
12+
TOOLS ?= ghcr.io/siderolabs/tools:v1.4.0-1-g955aabc
13+
PKGS ?= v1.4.1-5-ga333a84
14+
TALOS_VERSION ?= v1.4.0
15+
K8S_VERSION ?= 1.27.1
1616

17-
CONTROLLER_GEN_VERSION ?= v0.10.0
18-
CONVERSION_GEN_VERSION ?= v0.25.0
17+
CONTROLLER_GEN_VERSION ?= v0.11.3
18+
CONVERSION_GEN_VERSION ?= v0.26.0
1919

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

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

Lines changed: 1 addition & 1 deletion
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.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: talosconfigs.bootstrap.cluster.x-k8s.io
99
spec:

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

Lines changed: 1 addition & 1 deletion
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.10.0
6+
controller-gen.kubebuilder.io/version: v0.11.3
77
creationTimestamp: null
88
name: talosconfigtemplates.bootstrap.cluster.x-k8s.io
99
spec:

‎controllers/secrets.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ func (r *TalosConfigReconciler) writeSecretsBundleSecret(ctx context.Context, sc
113113
Namespace: scope.Config.Namespace,
114114
Name: secretName,
115115
Labels: map[string]string{
116-
capiv1.ClusterLabelName: scope.Cluster.Name,
116+
capiv1.ClusterNameLabel: scope.Cluster.Name,
117117
},
118118
OwnerReferences: []metav1.OwnerReference{
119119
*metav1.NewControllerRef(scope.Cluster, capiv1.GroupVersion.WithKind("Cluster")),
@@ -143,7 +143,7 @@ func (r *TalosConfigReconciler) writeK8sCASecret(ctx context.Context, scope *Tal
143143
Namespace: scope.Config.Namespace,
144144
Name: scope.Cluster.Name + "-ca",
145145
Labels: map[string]string{
146-
capiv1.ClusterLabelName: scope.Cluster.Name,
146+
capiv1.ClusterNameLabel: scope.Cluster.Name,
147147
},
148148
OwnerReferences: []metav1.OwnerReference{
149149
*metav1.NewControllerRef(scope.Cluster, capiv1.GroupVersion.WithKind("Cluster")),
@@ -185,7 +185,7 @@ func (r *TalosConfigReconciler) writeBootstrapData(ctx context.Context, scope *T
185185
Namespace: scope.Config.Namespace,
186186
Name: dataSecretName,
187187
Labels: map[string]string{
188-
capiv1.ClusterLabelName: scope.Cluster.Name,
188+
capiv1.ClusterNameLabel: scope.Cluster.Name,
189189
},
190190
OwnerReferences: []metav1.OwnerReference{
191191
*metav1.NewControllerRef(scope.Config, bootstrapv1alpha3.GroupVersion.WithKind("TalosConfig")),
@@ -253,7 +253,7 @@ func (r *TalosConfigReconciler) reconcileClientConfig(ctx context.Context, log l
253253
Namespace: scope.Cluster.Namespace,
254254
Name: dataSecretName,
255255
Labels: map[string]string{
256-
capiv1.ClusterLabelName: scope.Cluster.Name,
256+
capiv1.ClusterNameLabel: scope.Cluster.Name,
257257
},
258258
OwnerReferences: []metav1.OwnerReference{
259259
*metav1.NewControllerRef(scope.Cluster, capiv1.GroupVersion.WithKind("Cluster")),

‎controllers/talosconfig_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -588,7 +588,7 @@ func (r *TalosConfigReconciler) ClusterToTalosConfigs(o client.Object) []ctrl.Re
588588
selectors := []client.ListOption{
589589
client.InNamespace(c.Namespace),
590590
client.MatchingLabels{
591-
capiv1.ClusterLabelName: c.Name,
591+
capiv1.ClusterNameLabel: c.Name,
592592
},
593593
}
594594

‎go.mod‎

Lines changed: 30 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,25 @@ require (
88
github.com/google/go-cmp v0.5.9
99
github.com/siderolabs/crypto v0.4.0
1010
github.com/siderolabs/go-pointer v1.0.0
11-
github.com/siderolabs/talos/pkg/machinery v1.4.0-alpha.3
11+
github.com/siderolabs/talos/pkg/machinery v1.4.0
1212
github.com/spf13/pflag v1.0.5
1313
github.com/stretchr/testify v1.8.2
14-
golang.org/x/sys v0.6.0
14+
golang.org/x/sys v0.7.0
1515
gopkg.in/yaml.v2 v2.4.0
16-
k8s.io/api v0.25.0
17-
k8s.io/apiextensions-apiserver v0.25.0
18-
k8s.io/apimachinery v0.25.0
19-
k8s.io/client-go v0.25.0
20-
sigs.k8s.io/cluster-api v1.3.5
21-
sigs.k8s.io/controller-runtime v0.13.1
16+
k8s.io/api v0.26.1
17+
k8s.io/apiextensions-apiserver v0.26.1
18+
k8s.io/apimachinery v0.26.1
19+
k8s.io/client-go v0.26.1
20+
sigs.k8s.io/cluster-api v1.4.1
21+
sigs.k8s.io/controller-runtime v0.14.5
2222
)
2323

2424
require (
2525
github.com/MakeNowJust/heredoc v1.0.0 // indirect
2626
github.com/Masterminds/goutils v1.1.1 // indirect
2727
github.com/Masterminds/semver/v3 v3.2.0 // indirect
2828
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
29-
github.com/antlr/antlr4/runtime/Go/antlr v0.0.0-20220418222510-f25a4f6275ed // indirect
29+
github.com/antlr/antlr4/runtime/Go/antlr v1.4.10 // indirect
3030
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
3131
github.com/beorn7/perks v1.0.1 // indirect
3232
github.com/blang/semver v3.5.1+incompatible // indirect
@@ -48,13 +48,13 @@ require (
4848
github.com/go-openapi/jsonpointer v0.19.5 // indirect
4949
github.com/go-openapi/jsonreference v0.20.0 // indirect
5050
github.com/go-openapi/swag v0.22.3 // indirect
51-
github.com/gobuffalo/flect v0.3.0 // indirect
51+
github.com/gobuffalo/flect v1.0.2 // indirect
5252
github.com/gogo/protobuf v1.3.2 // indirect
5353
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5454
github.com/golang/protobuf v1.5.3 // indirect
55-
github.com/google/cel-go v0.12.4 // indirect
55+
github.com/google/cel-go v0.12.6 // indirect
5656
github.com/google/gnostic v0.6.9 // indirect
57-
github.com/google/go-github/v45 v45.2.0 // indirect
57+
github.com/google/go-github/v48 v48.2.0 // indirect
5858
github.com/google/go-querystring v1.1.0 // indirect
5959
github.com/google/gofuzz v1.2.0 // indirect
6060
github.com/google/uuid v1.3.0 // indirect
@@ -67,9 +67,9 @@ require (
6767
github.com/josharian/native v1.0.0 // indirect
6868
github.com/jsimonetti/rtnetlink v1.3.1 // indirect
6969
github.com/json-iterator/go v1.1.12 // indirect
70-
github.com/magiconair/properties v1.8.6 // indirect
70+
github.com/magiconair/properties v1.8.7 // indirect
7171
github.com/mailru/easyjson v0.7.7 // indirect
72-
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
72+
github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
7373
github.com/mdlayher/ethtool v0.0.0-20221212131811-ba3b4bc2e02c // indirect
7474
github.com/mdlayher/genetlink v1.3.1 // indirect
7575
github.com/mdlayher/netlink v1.7.1 // indirect
@@ -80,53 +80,52 @@ require (
8080
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8181
github.com/modern-go/reflect2 v1.0.2 // indirect
8282
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
83-
github.com/onsi/gomega v1.24.1 // indirect
83+
github.com/onsi/gomega v1.27.5 // indirect
8484
github.com/opencontainers/go-digest v1.0.0 // indirect
8585
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 // indirect
86-
github.com/pelletier/go-toml v1.9.5 // indirect
87-
github.com/pelletier/go-toml/v2 v2.0.5 // indirect
86+
github.com/pelletier/go-toml/v2 v2.0.6 // indirect
8887
github.com/pkg/errors v0.9.1 // indirect
8988
github.com/pmezard/go-difflib v1.0.0 // indirect
90-
github.com/prometheus/client_golang v1.13.0 // indirect
91-
github.com/prometheus/client_model v0.2.0 // indirect
89+
github.com/prometheus/client_golang v1.14.0 // indirect
90+
github.com/prometheus/client_model v0.3.0 // indirect
9291
github.com/prometheus/common v0.37.0 // indirect
9392
github.com/prometheus/procfs v0.8.0 // indirect
9493
github.com/ryanuber/go-glob v1.0.0 // indirect
9594
github.com/shopspring/decimal v1.3.1 // indirect
9695
github.com/siderolabs/gen v0.4.3 // indirect
97-
github.com/siderolabs/go-blockdevice v0.4.3 // indirect
96+
github.com/siderolabs/go-blockdevice v0.4.4 // indirect
9897
github.com/siderolabs/go-debug v0.2.2 // indirect
9998
github.com/siderolabs/net v0.4.0 // indirect
100-
github.com/spf13/afero v1.9.2 // indirect
99+
github.com/spf13/afero v1.9.3 // indirect
101100
github.com/spf13/cast v1.5.0 // indirect
102101
github.com/spf13/jwalterweatherman v1.1.0 // indirect
103-
github.com/spf13/viper v1.13.0 // indirect
102+
github.com/spf13/viper v1.15.0 // indirect
104103
github.com/stoewer/go-strcase v1.2.0 // indirect
105-
github.com/subosito/gotenv v1.4.1 // indirect
106-
github.com/valyala/fastjson v1.6.3 // indirect
104+
github.com/subosito/gotenv v1.4.2 // indirect
105+
github.com/valyala/fastjson v1.6.4 // indirect
107106
go.uber.org/atomic v1.10.0 // indirect
108107
go.uber.org/multierr v1.8.0 // indirect
109108
go.uber.org/zap v1.24.0 // indirect
110109
golang.org/x/crypto v0.3.0 // indirect
111110
golang.org/x/net v0.8.0 // indirect
112-
golang.org/x/oauth2 v0.0.0-20220909003341-f21342109be1 // indirect
111+
golang.org/x/oauth2 v0.6.0 // indirect
113112
golang.org/x/sync v0.1.0 // indirect
114113
golang.org/x/term v0.6.0 // indirect
115114
golang.org/x/text v0.8.0 // indirect
116-
golang.org/x/time v0.0.0-20220722155302-e5dcc9cfc0b9 // indirect
115+
golang.org/x/time v0.3.0 // indirect
117116
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
118117
google.golang.org/appengine v1.6.7 // indirect
119-
google.golang.org/genproto v0.0.0-20230320184635-7606e756e683 // indirect
118+
google.golang.org/genproto v0.0.0-20230330154414-c0448cd141ea // indirect
120119
google.golang.org/protobuf v1.30.0 // indirect
121120
gopkg.in/inf.v0 v0.9.1 // indirect
122121
gopkg.in/ini.v1 v1.67.0 // indirect
123122
gopkg.in/yaml.v3 v3.0.1 // indirect
124-
k8s.io/apiserver v0.25.0 // indirect
123+
k8s.io/apiserver v0.26.1 // indirect
125124
k8s.io/cluster-bootstrap v0.25.0 // indirect
126-
k8s.io/component-base v0.25.0 // indirect
125+
k8s.io/component-base v0.26.1 // indirect
127126
k8s.io/klog/v2 v2.80.1 // indirect
128-
k8s.io/kube-openapi v0.0.0-20220803164354-a70c9af30aea // indirect
129-
k8s.io/utils v0.0.0-20220823124924-e9cbc92d1a73 // indirect
127+
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
128+
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448 // indirect
130129
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
131130
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
132131
sigs.k8s.io/yaml v1.3.0 // indirect

0 commit comments

Comments
 (0)