Skip to content

Commit a2ac6f6

Browse files
smirasmira
committed
feat: update for Talos 1.9
Update dependencies, workaround for gRPC ALPN enforcement. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 927974d commit a2ac6f6

File tree

5 files changed

+133
-140
lines changed

5 files changed

+133
-140
lines changed

‎Makefile‎

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

2323
ARTIFACTS := _out
2424

25-
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-1-ga0c06c6
26-
PKGS ?= v1.8.0
25+
TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0
26+
PKGS ?= v1.9.0
2727

2828
BUILD := docker buildx build
2929
PLATFORM ?= linux/amd64

‎config/manager/manager.yaml‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ spec:
4747
requests:
4848
cpu: 100m
4949
memory: 128Mi
50+
env:
51+
- name: GRPC_ENFORCE_ALPN_ENABLED # Compatibility with Talos < 1.9
52+
value: "false"
5053
securityContext:
5154
allowPrivilegeEscalation: false
5255
capabilities:

‎go.mod‎

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

3-
go 1.22.7
3+
go 1.23.3
44

55
require (
66
github.com/coreos/go-semver v0.3.1
@@ -9,50 +9,51 @@ require (
99
github.com/google/uuid v1.6.0
1010
github.com/onsi/gomega v1.34.2
1111
github.com/pkg/errors v0.9.1
12-
github.com/siderolabs/capi-utils v0.0.0-20240910133445-d888b3297a6f
13-
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.6
14-
github.com/siderolabs/crypto v0.4.4
15-
github.com/siderolabs/gen v0.5.0
12+
github.com/siderolabs/capi-utils v0.0.0-20241204113326-d9f0c5fd0892
13+
github.com/siderolabs/cluster-api-bootstrap-provider-talos v0.6.7-0.20241203101019-7cd504f95414
14+
github.com/siderolabs/crypto v0.5.0
15+
github.com/siderolabs/gen v0.7.0
1616
github.com/siderolabs/go-retry v0.3.3
17-
github.com/siderolabs/talos/pkg/machinery v1.8.0
17+
github.com/siderolabs/talos/pkg/machinery v1.9.0-beta.0
1818
github.com/spf13/pflag v1.0.5
19-
github.com/stretchr/testify v1.9.0
20-
golang.org/x/sync v0.8.0
21-
google.golang.org/grpc v1.66.0
22-
google.golang.org/protobuf v1.34.2
19+
github.com/stretchr/testify v1.10.0
20+
golang.org/x/sync v0.9.0
21+
google.golang.org/grpc v1.68.0
22+
google.golang.org/protobuf v1.35.2
2323
gopkg.in/yaml.v3 v3.0.1
24-
k8s.io/api v0.31.1
25-
k8s.io/apiextensions-apiserver v0.31.1
26-
k8s.io/apimachinery v0.31.1
27-
k8s.io/apiserver v0.31.1
28-
k8s.io/client-go v0.31.1
29-
k8s.io/component-base v0.31.1
24+
k8s.io/api v0.31.3
25+
k8s.io/apiextensions-apiserver v0.31.3
26+
k8s.io/apimachinery v0.31.3
27+
k8s.io/apiserver v0.31.3
28+
k8s.io/client-go v0.31.3
29+
k8s.io/component-base v0.31.3
3030
k8s.io/klog/v2 v2.130.1
3131
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
32-
sigs.k8s.io/cluster-api v1.8.3
33-
sigs.k8s.io/controller-runtime v0.19.0
32+
sigs.k8s.io/cluster-api v1.8.5
33+
sigs.k8s.io/controller-runtime v0.19.3
3434
)
3535

3636
require (
37+
cel.dev/expr v0.18.0 // indirect
3738
github.com/MakeNowJust/heredoc v1.0.0 // indirect
3839
github.com/Masterminds/goutils v1.1.1 // indirect
3940
github.com/Masterminds/semver/v3 v3.2.0 // indirect
4041
github.com/Masterminds/sprig/v3 v3.2.3 // indirect
4142
github.com/NYTimes/gziphandler v1.1.1 // indirect
42-
github.com/ProtonMail/go-crypto v1.1.0-alpha.5.0.20240827111422-b5837fa4476e // indirect
43+
github.com/ProtonMail/go-crypto v1.1.3 // indirect
4344
github.com/ProtonMail/go-mime v0.0.0-20230322103455-7d82a3887f2f // indirect
44-
github.com/ProtonMail/gopenpgp/v2 v2.7.5 // indirect
45-
github.com/adrg/xdg v0.5.0 // indirect
46-
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
45+
github.com/ProtonMail/gopenpgp/v2 v2.8.1 // indirect
46+
github.com/adrg/xdg v0.5.3 // indirect
47+
github.com/antlr4-go/antlr/v4 v4.13.1 // indirect
4748
github.com/asaskevich/govalidator v0.0.0-20210307081110-f21760c49a8d // indirect
4849
github.com/beorn7/perks v1.0.1 // indirect
4950
github.com/blang/semver/v4 v4.0.0 // indirect
5051
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
5152
github.com/cespare/xxhash/v2 v2.3.0 // indirect
52-
github.com/cloudflare/circl v1.3.9 // indirect
53+
github.com/cloudflare/circl v1.5.0 // indirect
5354
github.com/containerd/go-cni v1.1.10 // indirect
5455
github.com/containernetworking/cni v1.2.3 // indirect
55-
github.com/cosi-project/runtime v0.5.5 // indirect
56+
github.com/cosi-project/runtime v0.7.2 // indirect
5657
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
5758
github.com/distribution/reference v0.6.0 // indirect
5859
github.com/drone/envsubst/v2 v2.0.0-20210730161058-179042472c46 // indirect
@@ -71,13 +72,13 @@ require (
7172
github.com/gogo/protobuf v1.3.2 // indirect
7273
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
7374
github.com/golang/protobuf v1.5.4 // indirect
74-
github.com/google/cel-go v0.21.0 // indirect
75+
github.com/google/cel-go v0.22.1 // indirect
7576
github.com/google/gnostic-models v0.6.8 // indirect
7677
github.com/google/go-cmp v0.6.0 // indirect
7778
github.com/google/go-github/v53 v53.2.0 // indirect
7879
github.com/google/go-querystring v1.1.0 // indirect
7980
github.com/google/gofuzz v1.2.0 // indirect
80-
github.com/grpc-ecosystem/grpc-gateway/v2 v2.22.0 // indirect
81+
github.com/grpc-ecosystem/grpc-gateway/v2 v2.24.0 // indirect
8182
github.com/hashicorp/errwrap v1.1.0 // indirect
8283
github.com/hashicorp/go-multierror v1.1.1 // indirect
8384
github.com/hashicorp/hcl v1.0.0 // indirect
@@ -90,7 +91,7 @@ require (
9091
github.com/json-iterator/go v1.1.12 // indirect
9192
github.com/magiconair/properties v1.8.7 // indirect
9293
github.com/mailru/easyjson v0.7.7 // indirect
93-
github.com/mdlayher/ethtool v0.1.0 // indirect
94+
github.com/mdlayher/ethtool v0.2.0 // indirect
9495
github.com/mdlayher/genetlink v1.3.2 // indirect
9596
github.com/mdlayher/netlink v1.7.2 // indirect
9697
github.com/mdlayher/socket v0.5.1 // indirect
@@ -104,7 +105,7 @@ require (
104105
github.com/opencontainers/runtime-spec v1.2.0 // indirect
105106
github.com/pelletier/go-toml/v2 v2.2.2 // indirect
106107
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c // indirect
107-
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
108+
github.com/planetscale/vtprotobuf v0.6.1-0.20241121165744-79df5c4772f2 // indirect
108109
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
109110
github.com/prometheus/client_golang v1.19.1 // indirect
110111
github.com/prometheus/client_model v0.6.1 // indirect
@@ -115,8 +116,7 @@ require (
115116
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
116117
github.com/shopspring/decimal v1.3.1 // indirect
117118
github.com/siderolabs/go-api-signature v0.3.6 // indirect
118-
github.com/siderolabs/go-blockdevice v0.4.7 // indirect
119-
github.com/siderolabs/go-blockdevice/v2 v2.0.2 // indirect
119+
github.com/siderolabs/go-blockdevice/v2 v2.0.6 // indirect
120120
github.com/siderolabs/go-pointer v1.0.0 // indirect
121121
github.com/siderolabs/net v0.4.0 // indirect
122122
github.com/siderolabs/protoenc v0.2.1 // indirect
@@ -125,7 +125,7 @@ require (
125125
github.com/spf13/cast v1.6.0 // indirect
126126
github.com/spf13/cobra v1.8.1 // indirect
127127
github.com/spf13/viper v1.19.0 // indirect
128-
github.com/stoewer/go-strcase v1.2.0 // indirect
128+
github.com/stoewer/go-strcase v1.3.0 // indirect
129129
github.com/subosito/gotenv v1.6.0 // indirect
130130
github.com/valyala/fastjson v1.6.4 // indirect
131131
github.com/x448/float16 v0.8.4 // indirect
@@ -139,17 +139,17 @@ require (
139139
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
140140
go.uber.org/multierr v1.11.0 // indirect
141141
go.uber.org/zap v1.27.0 // indirect
142-
golang.org/x/crypto v0.26.0 // indirect
143-
golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
144-
golang.org/x/net v0.28.0 // indirect
145-
golang.org/x/oauth2 v0.22.0 // indirect
146-
golang.org/x/sys v0.25.0 // indirect
147-
golang.org/x/term v0.23.0 // indirect
148-
golang.org/x/text v0.17.0 // indirect
149-
golang.org/x/time v0.6.0 // indirect
142+
golang.org/x/crypto v0.29.0 // indirect
143+
golang.org/x/exp v0.0.0-20241108190413-2d47ceb2692f // indirect
144+
golang.org/x/net v0.31.0 // indirect
145+
golang.org/x/oauth2 v0.24.0 // indirect
146+
golang.org/x/sys v0.27.0 // indirect
147+
golang.org/x/term v0.26.0 // indirect
148+
golang.org/x/text v0.20.0 // indirect
149+
golang.org/x/time v0.8.0 // indirect
150150
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
151-
google.golang.org/genproto/googleapis/api v0.0.0-20240903143218-8af14fe29dc1 // indirect
152-
google.golang.org/genproto/googleapis/rpc v0.0.0-20240903143218-8af14fe29dc1 // indirect
151+
google.golang.org/genproto/googleapis/api v0.0.0-20241118233622-e639e219e697 // indirect
152+
google.golang.org/genproto/googleapis/rpc v0.0.0-20241118233622-e639e219e697 // indirect
153153
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
154154
gopkg.in/inf.v0 v0.9.1 // indirect
155155
gopkg.in/ini.v1 v1.67.0 // indirect

0 commit comments

Comments
 (0)