Skip to content

Commit 1e36c44

Browse files
committed
feat: update Talos machinery to 0.13.0
This prepares machine configuration to use latest 0.13.0 features. One of the notable changes is the support for ECDSA-SHA256. Signed-off-by: Andrey Smirnov <[email protected]> (cherry picked from commit b7faf9e)
1 parent 3ce9e69 commit 1e36c44

File tree

5 files changed

+72
-59
lines changed

5 files changed

+72
-59
lines changed

.drone.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: default
55

66
services:
77
- name: docker
8-
image: docker:20.10-dind
8+
image: ghcr.io/smira/docker:20.10-dind-hacked
99
entrypoint: [dockerd]
1010
privileged: true
1111
volumes:
@@ -176,6 +176,6 @@ depends_on:
176176

177177
---
178178
kind: signature
179-
hmac: 523acbd6b6e92b11249b0515fe28ef34dc1c3c926826e84ce9a1de3412a6a65e
179+
hmac: 12516df930e65a1f19d52dbd86aa0e0d1bc68414ebf2d604573c8019022f21f6
180180

181181
...

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ NAME := cluster-api-talos-controller
99
ARTIFACTS := _out
1010

1111
TOOLS ?= ghcr.io/talos-systems/tools:v0.8.0-alpha.0-3-g2790b55
12-
PKGS ?= v0.8.0-alpha.0-3-gdb90f93
13-
TALOS_VERSION ?= v0.12.1
12+
PKGS ?= v0.8.0
13+
TALOS_VERSION ?= v0.13.0
1414
K8S_VERSION ?= 1.21.4
1515

1616
CONTROLLER_GEN_VERSION ?= v0.5.0

go.mod

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ require (
88
github.com/go-logr/logr v0.1.0
99
github.com/spf13/pflag v1.0.5
1010
github.com/stretchr/testify v1.7.0
11-
github.com/talos-systems/crypto v0.3.2
12-
github.com/talos-systems/talos/pkg/machinery v0.12.3
13-
golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c
11+
github.com/talos-systems/crypto v0.3.4
12+
github.com/talos-systems/talos/pkg/machinery v0.13.0
13+
golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6
1414
gopkg.in/yaml.v2 v2.4.0
1515
k8s.io/api v0.17.9
1616
k8s.io/apiextensions-apiserver v0.17.9
@@ -25,9 +25,9 @@ require (
2525
github.com/beorn7/perks v1.0.1 // indirect
2626
github.com/blang/semver v3.5.1+incompatible // indirect
2727
github.com/cespare/xxhash/v2 v2.1.1 // indirect
28-
github.com/containerd/go-cni v1.0.2 // indirect
29-
github.com/containernetworking/cni v0.8.1 // indirect
30-
github.com/cosi-project/runtime v0.0.0-20210707150857-25f235cd0682 // indirect
28+
github.com/containerd/go-cni v1.1.0 // indirect
29+
github.com/containernetworking/cni v1.0.1 // indirect
30+
github.com/cosi-project/runtime v0.0.0-20210906201716-5cb7f5002d77 // indirect
3131
github.com/davecgh/go-spew v1.1.1 // indirect
3232
github.com/docker/distribution v2.7.1+incompatible // indirect
3333
github.com/drone/envsubst v1.0.3-0.20200709223903-efdb65b94e5a // indirect
@@ -51,10 +51,10 @@ require (
5151
github.com/hashicorp/hcl v1.0.0 // indirect
5252
github.com/imdario/mergo v0.3.9 // indirect
5353
github.com/josharian/native v0.0.0-20200817173448-b6b71def0850 // indirect
54-
github.com/jsimonetti/rtnetlink v0.0.0-20210614053835-9c52e516c709 // indirect
55-
github.com/json-iterator/go v1.1.10 // indirect
56-
github.com/magiconair/properties v1.8.1 // indirect
57-
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
54+
github.com/jsimonetti/rtnetlink v0.0.0-20210922080037-435639c8e6a8 // indirect
55+
github.com/json-iterator/go v1.1.11 // indirect
56+
github.com/magiconair/properties v1.8.5 // indirect
57+
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
5858
github.com/mdlayher/ethtool v0.0.0-20210210192532-2b88debcdd43 // indirect
5959
github.com/mdlayher/genetlink v1.0.0 // indirect
6060
github.com/mdlayher/netlink v1.4.1 // indirect
@@ -78,7 +78,8 @@ require (
7878
github.com/spf13/jwalterweatherman v1.0.0 // indirect
7979
github.com/spf13/viper v1.6.2 // indirect
8080
github.com/subosito/gotenv v1.2.0 // indirect
81-
github.com/talos-systems/go-blockdevice v0.2.3 // indirect
81+
github.com/talos-systems/go-blockdevice v0.2.4 // indirect
82+
github.com/talos-systems/go-debug v0.2.1 // indirect
8283
github.com/talos-systems/net v0.3.0 // indirect
8384
go.uber.org/atomic v1.7.0 // indirect
8485
go.uber.org/multierr v1.7.0 // indirect
@@ -87,11 +88,11 @@ require (
8788
golang.org/x/net v0.0.0-20210525063256-abc453219eb5 // indirect
8889
golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect
8990
golang.org/x/text v0.3.6 // indirect
90-
golang.org/x/time v0.0.0-20191024005414-555d28b269f0 // indirect
91-
gomodules.xyz/jsonpatch/v2 v2.0.1 // indirect
92-
google.golang.org/appengine v1.6.6 // indirect
93-
google.golang.org/genproto v0.0.0-20210722135532-667f2b7c528f // indirect
94-
google.golang.org/grpc v1.40.0 // indirect
91+
golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect
92+
gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
93+
google.golang.org/appengine v1.6.7 // indirect
94+
google.golang.org/genproto v0.0.0-20210924002016-3dee208752a0 // indirect
95+
google.golang.org/grpc v1.41.0 // indirect
9596
google.golang.org/protobuf v1.27.1 // indirect
9697
gopkg.in/fsnotify.v1 v1.4.7 // indirect
9798
gopkg.in/inf.v0 v0.9.1 // indirect

0 commit comments

Comments
 (0)