Skip to content

Commit 0bd00d0

Browse files
smirasmira
committed
feat: update to Talos 1.2.0
Update Talos, CAPI core version, pkgs, tools. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit b5a5fc6)
1 parent 98e1df1 commit 0bd00d0

File tree

9 files changed

+326
-441
lines changed

9 files changed

+326
-441
lines changed

‎Dockerfile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ ENV GO111MODULE on
2424
ENV GOPROXY https://proxy.golang.org
2525
ENV GOCACHE /.cache/go-build
2626
ENV GOMODCACHE /.cache/mod
27-
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.8.0
28-
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.23.1
27+
RUN --mount=type=cache,target=/.cache go install sigs.k8s.io/controller-tools/cmd/controller-gen@v0.9.1
28+
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/conversion-gen@v0.24.2
2929
WORKDIR /src
3030
COPY ./go.mod ./
3131
COPY ./go.sum ./

‎Makefile‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ GO_LDFLAGS += -s -w
1818

1919
ARTIFACTS := _out
2020

21-
TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-1-g134974c
22-
PKGS ?= v1.1.0-8-gfa9a488
21+
TOOLS ?= ghcr.io/siderolabs/tools:v1.2.0
22+
PKGS ?= v1.2.0
2323

2424
BUILD := docker buildx build
2525
PLATFORM ?= linux/amd64

‎README.md‎

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

2727
This provider's versions are able to install and manage the following versions of Kubernetes:
2828

29-
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 |
30-
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
31-
| Control Plane Provider Talos v1alpha3 (v0.2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
32-
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | |
33-
| Control Plane Provider Talos v1alpha3 (v0.4) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
29+
| | v1.16 | v 1.17 | v1.18 | v1.19 | v1.20 | v1.21 | v1.22 | v1.23 | v1.24 | v1.25 |
30+
| ------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- | ----- | ----- | ----- |
31+
| Control Plane Provider Talos v1alpha3 (v0.2) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
32+
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | | | | |
33+
| Control Plane Provider Talos v1alpha3 (v0.4) | | | | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
3434

3535
This provider's versions are compatible with the following versions of Talos:
3636

37-
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 |
38-
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- |
39-
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | | | | |
40-
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | | | |
41-
| Control Plane Provider Talos v1alpha3 (v0.4) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
37+
| | v0.11 | v0.12 | v0.13 | v0.14 | v1.0 | v1.1 | v1.2 |
38+
| -------------------------------------------- | ----- | ------ | ----- | ----- | ----- | ----- | ----- |
39+
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | | | | | |
40+
| Control Plane Provider Talos v1alpha3 (v0.3) | ✓ | ✓ | ✓ | | | | |
41+
| Control Plane Provider Talos v1alpha3 (v0.4) | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ | ✓ |
4242

4343
## Building and Installing
4444

‎config/crd/bases/controlplane.cluster.x-k8s.io_taloscontrolplanes.yaml‎

Lines changed: 2 additions & 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: taloscontrolplanes.controlplane.cluster.x-k8s.io
99
spec:
@@ -177,6 +177,7 @@ spec:
177177
description: 'UID of the referent. More info: https://kubernetes.io/docs/concepts/overview/working-with-objects/names/#uids'
178178
type: string
179179
type: object
180+
x-kubernetes-map-type: atomic
180181
replicas:
181182
description: Number of desired machines. Defaults to 1. When stacked
182183
etcd is used only odd numbers are permitted, as per [etcd best practice](https://etcd.io/docs/v3.3.12/faq/#why-an-odd-number-of-cluster-members).
@@ -331,9 +332,3 @@ spec:
331332
specReplicasPath: .spec.replicas
332333
statusReplicasPath: .status.replicas
333334
status: {}
334-
status:
335-
acceptedNames:
336-
kind: ""
337-
plural: ""
338-
conditions: []
339-
storedVersions: []

‎controllers/taloscontrolplane_controller.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ func (r *TalosControlPlaneReconciler) bootControlPlane(ctx context.Context, clus
363363
Name: names.SimpleNameGenerator.GenerateName(tcp.Name + "-"),
364364
Namespace: tcp.Namespace,
365365
Labels: map[string]string{
366-
clusterv1.ClusterLabelName: cluster.ClusterName,
366+
clusterv1.ClusterLabelName: cluster.Name,
367367
clusterv1.MachineControlPlaneLabelName: "",
368368
},
369369
OwnerReferences: []metav1.OwnerReference{

‎go.mod‎

Lines changed: 67 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
11
module github.com/talos-systems/cluster-api-control-plane-provider-talos
22

3-
go 1.17
3+
go 1.19
44

55
require (
66
github.com/coreos/go-semver v0.3.0
77
github.com/go-logr/logr v1.2.0
88
github.com/go-logr/zapr v1.2.0 // indirect
99
github.com/google/uuid v1.3.0
1010
github.com/onsi/ginkgo v1.16.5
11-
github.com/onsi/gomega v1.17.0
11+
github.com/onsi/gomega v1.18.1
1212
github.com/pkg/errors v0.9.1
13-
github.com/stretchr/testify v1.7.1
14-
github.com/talos-systems/capi-utils v0.0.0-20220330110254-2b207c1f0aff
15-
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.4
13+
github.com/siderolabs/capi-utils v0.0.0-20220901184547-9bb8c313ba2e
14+
github.com/stretchr/testify v1.8.0
15+
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.5
1616
github.com/talos-systems/go-retry v0.3.1
17-
github.com/talos-systems/talos/pkg/machinery v1.1.1
18-
google.golang.org/grpc v1.46.2
19-
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
20-
k8s.io/api v0.23.5
21-
k8s.io/apimachinery v0.23.5
22-
k8s.io/apiserver v0.23.5
23-
k8s.io/client-go v0.23.5
24-
k8s.io/utils v0.0.0-20211116205334-6203023598ed
25-
sigs.k8s.io/cluster-api v1.1.4
26-
sigs.k8s.io/controller-runtime v0.11.2
17+
github.com/talos-systems/talos/pkg/machinery v1.2.0
18+
google.golang.org/grpc v1.48.0
19+
gopkg.in/yaml.v3 v3.0.1
20+
k8s.io/api v0.24.2
21+
k8s.io/apimachinery v0.24.2
22+
k8s.io/apiserver v0.24.2
23+
k8s.io/client-go v0.24.2
24+
k8s.io/utils v0.0.0-20220210201930-3a6ce19ff2f9
25+
sigs.k8s.io/cluster-api v1.2.1
26+
sigs.k8s.io/controller-runtime v0.12.3
2727
)
2828

29-
require k8s.io/klog/v2 v2.30.0
29+
require k8s.io/klog/v2 v2.60.1
3030

3131
require (
32-
cloud.google.com/go v0.99.0 // indirect
32+
cloud.google.com/go/compute v1.7.0 // indirect
3333
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3434
github.com/Masterminds/goutils v1.1.1 // indirect
3535
github.com/Masterminds/semver/v3 v3.1.1 // indirect
@@ -41,88 +41,97 @@ require (
4141
github.com/beorn7/perks v1.0.1 // indirect
4242
github.com/blang/semver v3.5.1+incompatible // indirect
4343
github.com/cespare/xxhash/v2 v2.1.2 // indirect
44-
github.com/containerd/go-cni v1.1.5 // indirect
45-
github.com/containernetworking/cni v1.1.0 // indirect
44+
github.com/containerd/go-cni v1.1.7 // indirect
45+
github.com/containernetworking/cni v1.1.2 // indirect
4646
github.com/coredns/caddy v1.1.0 // indirect
47-
github.com/coredns/corefile-migration v1.0.14 // indirect
48-
github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
47+
github.com/coredns/corefile-migration v1.0.17 // indirect
48+
github.com/cosi-project/runtime v0.1.1 // indirect
4949
github.com/davecgh/go-spew v1.1.1 // indirect
50-
github.com/docker/distribution v2.7.1+incompatible // indirect
50+
github.com/docker/distribution v2.8.1+incompatible // indirect
5151
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
52+
github.com/emicklei/go-restful v2.15.0+incompatible // indirect
5253
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
5354
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
54-
github.com/fsnotify/fsnotify v1.5.1 // indirect
55+
github.com/fsnotify/fsnotify v1.5.4 // indirect
56+
github.com/gertd/go-pluralize v0.2.1 // indirect
5557
github.com/go-openapi/jsonpointer v0.19.5 // indirect
5658
github.com/go-openapi/jsonreference v0.19.5 // indirect
5759
github.com/go-openapi/swag v0.19.14 // indirect
58-
github.com/gobuffalo/flect v0.2.4 // indirect
60+
github.com/gobuffalo/flect v0.2.5 // indirect
5961
github.com/gogo/protobuf v1.3.2 // indirect
6062
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
6163
github.com/golang/protobuf v1.5.2 // indirect
62-
github.com/google/cel-go v0.9.0 // indirect
63-
github.com/google/go-cmp v0.5.7 // indirect
64-
github.com/google/go-github/v33 v33.0.0 // indirect
65-
github.com/google/go-querystring v1.0.0 // indirect
64+
github.com/google/cel-go v0.10.1 // indirect
65+
github.com/google/gnostic v0.5.7-v3refs // indirect
66+
github.com/google/go-cmp v0.5.8 // indirect
67+
github.com/google/go-github/v45 v45.2.0 // indirect
68+
github.com/google/go-querystring v1.1.0 // indirect
6669
github.com/google/gofuzz v1.2.0 // indirect
67-
github.com/googleapis/gnostic v0.5.5 // indirect
68-
github.com/hashicorp/errwrap v1.0.0 // indirect
70+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.2 // indirect
71+
github.com/hashicorp/errwrap v1.1.0 // indirect
6972
github.com/hashicorp/go-multierror v1.1.1 // indirect
7073
github.com/hashicorp/hcl v1.0.0 // indirect
7174
github.com/huandu/xstrings v1.3.2 // indirect
7275
github.com/imdario/mergo v0.3.12 // indirect
7376
github.com/josharian/intern v1.0.0 // indirect
7477
github.com/json-iterator/go v1.1.12 // indirect
75-
github.com/magiconair/properties v1.8.5 // indirect
78+
github.com/magiconair/properties v1.8.6 // indirect
7679
github.com/mailru/easyjson v0.7.6 // indirect
7780
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
7881
github.com/mitchellh/copystructure v1.2.0 // indirect
79-
github.com/mitchellh/mapstructure v1.4.3 // indirect
82+
github.com/mitchellh/mapstructure v1.5.0 // indirect
8083
github.com/mitchellh/reflectwalk v1.0.2 // indirect
8184
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8285
github.com/modern-go/reflect2 v1.0.2 // indirect
86+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
8387
github.com/nxadm/tail v1.4.8 // indirect
8488
github.com/opencontainers/go-digest v1.0.0 // indirect
85-
github.com/pelletier/go-toml v1.9.4 // indirect
89+
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d // indirect
90+
github.com/pelletier/go-toml v1.9.5 // indirect
91+
github.com/pelletier/go-toml/v2 v2.0.1 // indirect
8692
github.com/pmezard/go-difflib v1.0.0 // indirect
87-
github.com/prometheus/client_golang v1.11.0 // indirect
93+
github.com/prometheus/client_golang v1.12.1 // indirect
8894
github.com/prometheus/client_model v0.2.0 // indirect
89-
github.com/prometheus/common v0.28.0 // indirect
90-
github.com/prometheus/procfs v0.7.2 // indirect
95+
github.com/prometheus/common v0.32.1 // indirect
96+
github.com/prometheus/procfs v0.7.3 // indirect
9197
github.com/shopspring/decimal v1.2.0 // indirect
9298
github.com/siderolabs/go-pointer v1.0.0 // indirect
93-
github.com/spf13/afero v1.6.0 // indirect
94-
github.com/spf13/cast v1.4.1 // indirect
99+
github.com/siderolabs/protoenc v0.1.3 // indirect
100+
github.com/spf13/afero v1.8.2 // indirect
101+
github.com/spf13/cast v1.5.0 // indirect
95102
github.com/spf13/jwalterweatherman v1.1.0 // indirect
96103
github.com/spf13/pflag v1.0.5 // indirect
97-
github.com/spf13/viper v1.10.1 // indirect
104+
github.com/spf13/viper v1.12.0 // indirect
98105
github.com/stoewer/go-strcase v1.2.0 // indirect
99-
github.com/subosito/gotenv v1.2.0 // indirect
100-
github.com/talos-systems/crypto v0.3.5 // indirect
101-
github.com/talos-systems/net v0.3.2 // indirect
106+
github.com/subosito/gotenv v1.3.0 // indirect
107+
github.com/talos-systems/crypto v0.3.6 // indirect
102108
github.com/valyala/fastjson v1.6.3 // indirect
103-
go.uber.org/atomic v1.7.0 // indirect
104-
go.uber.org/multierr v1.7.0 // indirect
105-
go.uber.org/zap v1.21.0 // indirect
106-
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
107-
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
108-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
109-
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
109+
go.uber.org/atomic v1.9.0 // indirect
110+
go.uber.org/multierr v1.8.0 // indirect
111+
go.uber.org/zap v1.22.0 // indirect
112+
go4.org/intern v0.0.0-20220617035311-6925f38cc365 // indirect
113+
go4.org/unsafe/assume-no-moving-gc v0.0.0-20220617031537-928513b29760 // indirect
114+
golang.org/x/crypto v0.0.0-20220411220226-7b82a4e95df4 // indirect
115+
golang.org/x/net v0.0.0-20220809184613-07c6da5e1ced // indirect
116+
golang.org/x/oauth2 v0.0.0-20220722155238-128564f6959c // indirect
117+
golang.org/x/sys v0.0.0-20220829200755-d48e67d00261 // indirect
110118
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
111119
golang.org/x/text v0.3.7 // indirect
112-
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
120+
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
113121
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
114122
google.golang.org/appengine v1.6.7 // indirect
115-
google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
116-
google.golang.org/protobuf v1.28.0 // indirect
123+
google.golang.org/genproto v0.0.0-20220812140447-cec7f5303424 // indirect
124+
google.golang.org/protobuf v1.28.1 // indirect
117125
gopkg.in/inf.v0 v0.9.1 // indirect
118-
gopkg.in/ini.v1 v1.66.2 // indirect
126+
gopkg.in/ini.v1 v1.66.4 // indirect
119127
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
120128
gopkg.in/yaml.v2 v2.4.0 // indirect
121-
k8s.io/apiextensions-apiserver v0.23.5 // indirect
122-
k8s.io/cluster-bootstrap v0.23.0 // indirect
123-
k8s.io/component-base v0.23.5 // indirect
124-
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
125-
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
129+
inet.af/netaddr v0.0.0-20220811202034-502d2d690317 // indirect
130+
k8s.io/apiextensions-apiserver v0.24.2 // indirect
131+
k8s.io/cluster-bootstrap v0.24.0 // indirect
132+
k8s.io/component-base v0.24.2 // indirect
133+
k8s.io/kube-openapi v0.0.0-20220328201542-3ee0da9b0b42 // indirect
134+
sigs.k8s.io/json v0.0.0-20211208200746-9f7c6b3444d2 // indirect
126135
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect
127136
sigs.k8s.io/yaml v1.3.0 // indirect
128137
)

0 commit comments

Comments
 (0)