Skip to content

Commit 5d46924

Browse files
committed
feat: update Talos to final 1.7.0
Preparing for a release. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 282f029 commit 5d46924

File tree

5 files changed

+24
-14
lines changed

5 files changed

+24
-14
lines changed

.drone.yml

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

66
services:
77
- name: docker
8-
image: ghcr.io/smira/docker:20.10-dind-hacked
8+
image: docker:25.0.2-dind
99
entrypoint: [dockerd]
1010
privileged: true
1111
volumes:
@@ -210,6 +210,6 @@ depends_on:
210210
- default
211211
---
212212
kind: signature
213-
hmac: e3d18401c2205988061491de11ad06b3336a5a0f6df49787832683e472b8d427
213+
hmac: eeb94937711d209fb900a20a2bef3dac019313017914269a7e7bcf896d8d7e16
214214

215215
...

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

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,12 @@ spec:
104104
Allowed values: "MachineName" (use linked Machine's Name).
105105
type: string
106106
type: object
107+
strategicPatches:
108+
description: Talos Linux machine configuration strategic merge
109+
patch list.
110+
items:
111+
type: string
112+
type: array
107113
talosVersion:
108114
type: string
109115
required:
@@ -143,6 +149,12 @@ spec:
143149
Allowed values: "MachineName" (use linked Machine's Name).
144150
type: string
145151
type: object
152+
strategicPatches:
153+
description: Talos Linux machine configuration strategic merge
154+
patch list.
155+
items:
156+
type: string
157+
type: array
146158
talosVersion:
147159
type: string
148160
required:

go.mod

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@ require (
1010
github.com/onsi/gomega v1.32.0
1111
github.com/pkg/errors v0.9.1
1212
github.com/siderolabs/capi-utils v0.0.0-20240417131828-8470421c5823
13-
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.4
13+
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.5
1414
github.com/siderolabs/crypto v0.4.4
1515
github.com/siderolabs/gen v0.4.8
1616
github.com/siderolabs/go-retry v0.3.3
17-
github.com/siderolabs/talos/pkg/machinery v1.7.0-beta.1
17+
github.com/siderolabs/talos/pkg/machinery v1.7.0
1818
github.com/spf13/pflag v1.0.5
1919
github.com/stretchr/testify v1.9.0
2020
golang.org/x/sync v0.7.0
@@ -142,7 +142,7 @@ require (
142142
golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect
143143
golang.org/x/net v0.23.0 // indirect
144144
golang.org/x/oauth2 v0.18.0 // indirect
145-
golang.org/x/sys v0.18.0 // indirect
145+
golang.org/x/sys v0.19.0 // indirect
146146
golang.org/x/term v0.18.0 // indirect
147147
golang.org/x/text v0.14.0 // indirect
148148
golang.org/x/time v0.5.0 // indirect

go.sum

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -276,8 +276,8 @@ github.com/shopspring/decimal v1.3.1 h1:2Usl1nmF/WZucqkFZhnfFYxxxu8LG21F6nPQBE5g
276276
github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFRcu2hWCYk4o=
277277
github.com/siderolabs/capi-utils v0.0.0-20240417131828-8470421c5823 h1:E/vfrd0ef/uNc5sR424txTulpXEaCKgolP1R3iumQP8=
278278
github.com/siderolabs/capi-utils v0.0.0-20240417131828-8470421c5823/go.mod h1:nl0moah4eZrz4onXniD9qOkEg+FdoIbwbmZCo/jtDQs=
279-
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.4 h1:obDpDKsSL8QGBrpdNXhxiALSAii+D9zojkXgrf4+u1c=
280-
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.4/go.mod h1:U+1pkbI6st1SVodPgIzJWpvxKfUkAp8oT9wo8EBDrEs=
279+
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.5 h1:ENGDxqNW/+hxlbueonGdR9tAeFB3Brqj0em8Ajy/zvI=
280+
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.5/go.mod h1:NEs8aRRaMRBqKPMbap4kC/yoRYdNFE+Yy0Ob9ObCs+8=
281281
github.com/siderolabs/crypto v0.4.4 h1:Q6EDBMR2Ub2oAZW5Xl8lrKB27bM3Sn8Gkfw3rngco5U=
282282
github.com/siderolabs/crypto v0.4.4/go.mod h1:hsR3tJ3aaeuhCChsLF4dBd9vlJVPvmhg4vvx2ez4aD4=
283283
github.com/siderolabs/gen v0.4.8 h1:VNpbmDLhkXp7qcSEkKk1Ee7vU2afs3xvHrWLGR2UuiY=
@@ -294,8 +294,8 @@ github.com/siderolabs/net v0.4.0 h1:1bOgVay/ijPkJz4qct98nHsiB/ysLQU0KLoBC4qLm7I=
294294
github.com/siderolabs/net v0.4.0/go.mod h1:/ibG+Hm9HU27agp5r9Q3eZicEfjquzNzQNux5uEk0kM=
295295
github.com/siderolabs/protoenc v0.2.1 h1:BqxEmeWQeMpNP3R6WrPqDatX8sM/r4t97OP8mFmg6GA=
296296
github.com/siderolabs/protoenc v0.2.1/go.mod h1:StTHxjet1g11GpNAWiATgc8K0HMKiFSEVVFOa/H0otc=
297-
github.com/siderolabs/talos/pkg/machinery v1.7.0-beta.1 h1:COkEfnczCKFQTH9vxssehKZ4CAvciNZjcb8QCAJELfg=
298-
github.com/siderolabs/talos/pkg/machinery v1.7.0-beta.1/go.mod h1:YBl9KDCD45Uc7N0rXBY1JqovUn1n46ekUPSNbEVZzQU=
297+
github.com/siderolabs/talos/pkg/machinery v1.7.0 h1:fZiqXwdraM0lfN6/MtBO6sSkeUCaKBtGfP7VUBpOXao=
298+
github.com/siderolabs/talos/pkg/machinery v1.7.0/go.mod h1:YBl9KDCD45Uc7N0rXBY1JqovUn1n46ekUPSNbEVZzQU=
299299
github.com/sirupsen/logrus v1.9.0 h1:trlNQbNUG3OdDrDil03MCb1H2o9nJ1x4/5LYw7byDE0=
300300
github.com/sirupsen/logrus v1.9.0/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
301301
github.com/soheilhy/cmux v0.1.5 h1:jjzc5WVemNEDTLwv9tlmemhC73tI08BNOIGwBOo10Js=
@@ -418,8 +418,6 @@ golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJ
418418
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
419419
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
420420
golang.org/x/sync v0.1.0/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
421-
golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
422-
golang.org/x/sync v0.6.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
423421
golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M=
424422
golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
425423
golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -443,8 +441,8 @@ golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
443441
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
444442
golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
445443
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
446-
golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
447-
golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
444+
golang.org/x/sys v0.19.0 h1:q5f1RH2jigJ1MoAWp2KTp3gm5zAGFUTarQZ5U386+4o=
445+
golang.org/x/sys v0.19.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
448446
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
449447
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
450448
golang.org/x/term v0.2.0/go.mod h1:TVmDHMZPmdnySmBfhjOoOdhjzdE1h4u1VwSiw2l1Nuc=

hack/test/e2e-aws.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ TAG="${TAG:-$(git describe --tag --always --dirty)}"
2222
REGION="us-east-1"
2323
BUCKET="talos-ci-e2e"
2424
PLATFORM=$(uname -s | tr "[:upper:]" "[:lower:]")
25-
TALOS_VERSION="${TALOS_DEFAULT:-v1.7.0-beta.1}" # NOTE: this is Talos version for the test environment, not Talos version for CAPI templates (see capi-utils)
25+
TALOS_VERSION="${TALOS_DEFAULT:-v1.7.0}" # NOTE: this is Talos version for the test environment, not Talos version for CAPI templates (see capi-utils)
2626
K8S_VERSION="${K8S_VERSION:-v1.29.3}"
2727
export WORKLOAD_KUBERNETES_VERSION="${WORKLOAD_KUBERNETES_VERSION:-${K8S_VERSION}}"
2828
export UPGRADE_K8S_VERSION="${UPGRADE_K8S_VERSION:-v1.29.4}"

0 commit comments

Comments
 (0)