Skip to content

Commit 86f043f

Browse files
smirasmira
committed
feat: update CABPT to 0.5.4, Talos to 1.1.0
Cascading update to make sure we can test with latest. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit d8b6d34)
1 parent f0319d3 commit 86f043f

File tree

6 files changed

+89
-57
lines changed

6 files changed

+89
-57
lines changed

‎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.0.0
22-
PKGS ?= v1.0.0
21+
TOOLS ?= ghcr.io/siderolabs/tools:v1.1.0-1-g134974c
22+
PKGS ?= v1.1.0-8-gfa9a488
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 |
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 |
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 | v 0.12 | v0.13 | v0.14 | v1.0 |
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 |
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

‎go.mod‎

Lines changed: 21 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,23 +12,24 @@ require (
1212
github.com/pkg/errors v0.9.1
1313
github.com/stretchr/testify v1.7.1
1414
github.com/talos-systems/capi-utils v0.0.0-20220330110254-2b207c1f0aff
15-
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.3
15+
github.com/talos-systems/cluster-api-bootstrap-provider-talos v0.5.4
1616
github.com/talos-systems/go-retry v0.3.1
17-
github.com/talos-systems/talos/pkg/machinery v1.0.0
18-
google.golang.org/grpc v1.44.0
17+
github.com/talos-systems/talos/pkg/machinery v1.1.0
18+
google.golang.org/grpc v1.46.2
1919
gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
20-
k8s.io/api v0.23.4
21-
k8s.io/apimachinery v0.23.4
22-
k8s.io/apiserver v0.23.0
23-
k8s.io/client-go v0.23.4
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
2424
k8s.io/utils v0.0.0-20211116205334-6203023598ed
25-
sigs.k8s.io/cluster-api v1.1.3
26-
sigs.k8s.io/controller-runtime v0.11.1
25+
sigs.k8s.io/cluster-api v1.1.4
26+
sigs.k8s.io/controller-runtime v0.11.2
2727
)
2828

29+
require k8s.io/klog/v2 v2.30.0
30+
2931
require (
3032
cloud.google.com/go v0.99.0 // indirect
31-
github.com/AlekSi/pointer v1.2.0 // indirect
3233
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3334
github.com/Masterminds/goutils v1.1.1 // indirect
3435
github.com/Masterminds/semver/v3 v3.1.1 // indirect
@@ -40,11 +41,11 @@ require (
4041
github.com/beorn7/perks v1.0.1 // indirect
4142
github.com/blang/semver v3.5.1+incompatible // indirect
4243
github.com/cespare/xxhash/v2 v2.1.2 // indirect
43-
github.com/containerd/go-cni v1.1.3 // indirect
44-
github.com/containernetworking/cni v1.0.1 // indirect
44+
github.com/containerd/go-cni v1.1.5 // indirect
45+
github.com/containernetworking/cni v1.1.0 // indirect
4546
github.com/coredns/caddy v1.1.0 // indirect
4647
github.com/coredns/corefile-migration v1.0.14 // indirect
47-
github.com/cosi-project/runtime v0.0.0-20211216175730-264f8fcd1a4f // indirect
48+
github.com/cosi-project/runtime v0.0.0-20220527181155-95d06feaf8b5 // indirect
4849
github.com/davecgh/go-spew v1.1.1 // indirect
4950
github.com/docker/distribution v2.7.1+incompatible // indirect
5051
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -88,6 +89,7 @@ require (
8889
github.com/prometheus/common v0.28.0 // indirect
8990
github.com/prometheus/procfs v0.7.2 // indirect
9091
github.com/shopspring/decimal v1.2.0 // indirect
92+
github.com/siderolabs/go-pointer v1.0.0 // indirect
9193
github.com/spf13/afero v1.6.0 // indirect
9294
github.com/spf13/cast v1.4.1 // indirect
9395
github.com/spf13/jwalterweatherman v1.1.0 // indirect
@@ -100,26 +102,25 @@ require (
100102
github.com/valyala/fastjson v1.6.3 // indirect
101103
go.uber.org/atomic v1.7.0 // indirect
102104
go.uber.org/multierr v1.7.0 // indirect
103-
go.uber.org/zap v1.19.1 // indirect
105+
go.uber.org/zap v1.21.0 // indirect
104106
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5 // indirect
105107
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd // indirect
106108
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
107-
golang.org/x/sys v0.0.0-20220209214540-3681064d5158 // indirect
109+
golang.org/x/sys v0.0.0-20220408201424-a24fb2fb8a0f // indirect
108110
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
109111
golang.org/x/text v0.3.7 // indirect
110112
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
111113
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
112114
google.golang.org/appengine v1.6.7 // indirect
113-
google.golang.org/genproto v0.0.0-20220228155957-1da8797a5878 // indirect
114-
google.golang.org/protobuf v1.27.1 // indirect
115+
google.golang.org/genproto v0.0.0-20220531134929-86cf59382f1b // indirect
116+
google.golang.org/protobuf v1.28.0 // indirect
115117
gopkg.in/inf.v0 v0.9.1 // indirect
116118
gopkg.in/ini.v1 v1.66.2 // indirect
117119
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
118120
gopkg.in/yaml.v2 v2.4.0 // indirect
119-
k8s.io/apiextensions-apiserver v0.23.0 // indirect
121+
k8s.io/apiextensions-apiserver v0.23.5 // indirect
120122
k8s.io/cluster-bootstrap v0.23.0 // indirect
121-
k8s.io/component-base v0.23.0 // indirect
122-
k8s.io/klog/v2 v2.30.0 // indirect
123+
k8s.io/component-base v0.23.5 // indirect
123124
k8s.io/kube-openapi v0.0.0-20211115234752-e816edb12b65 // indirect
124125
sigs.k8s.io/json v0.0.0-20211020170558-c049b76a60c6 // indirect
125126
sigs.k8s.io/structured-merge-diff/v4 v4.2.1 // indirect

0 commit comments

Comments
 (0)