Skip to content

Commit 9916e2c

Browse files
smirasmira
committed
chore: update pkgs/tools/extras for Go 1.23.3
Bump some dependencies as well. Signed-off-by: Andrey Smirnov <[email protected]>
1 parent 20bbf02 commit 9916e2c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+246
-227
lines changed

Diff for: ‎.golangci.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ linters-settings:
3939
errcheck:
4040
# report about not checking of errors in type assetions: `a := b.(MyStruct)`;
4141
# default is false: such cases aren't reported by default.
42-
check-type-assertions: true
42+
check-type-assertions: false # we have forcetypeassert linter for it
4343

4444
# report about assignment of errors to blank identifier: `num, _ := strconv.Atoi(numStr)`;
4545
# default is false: such cases aren't reported by default.
@@ -148,6 +148,7 @@ linters:
148148
- inamedparam # too annoying
149149
- protogetter # too annoying
150150
- perfsprint
151+
- recvcheck # too annoying
151152
disable-all: false
152153
fast: false
153154

Diff for: ‎Dockerfile

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax = docker/dockerfile-upstream:1.10.0-labs
1+
# syntax = docker/dockerfile-upstream:1.11.1-labs
22

33
# Meta args applied to stage base names.
44

@@ -143,28 +143,28 @@ FROM ${PKG_KERNEL} AS pkg-kernel
143143
FROM --platform=amd64 ${PKG_KERNEL} AS pkg-kernel-amd64
144144
FROM --platform=arm64 ${PKG_KERNEL} AS pkg-kernel-arm64
145145

146-
FROM --platform=amd64 ${TOOLS} as tools-amd64
147-
FROM --platform=arm64 ${TOOLS} as tools-arm64
146+
FROM --platform=amd64 ${TOOLS} AS tools-amd64
147+
FROM --platform=arm64 ${TOOLS} AS tools-arm64
148148

149-
FROM scratch as pkg-debug-tools-scratch-amd64
150-
FROM scratch as pkg-debug-tools-scratch-arm64
149+
FROM scratch AS pkg-debug-tools-scratch-amd64
150+
FROM scratch AS pkg-debug-tools-scratch-arm64
151151

152-
FROM scratch as pkg-debug-tools-bash-minimal-amd64
152+
FROM scratch AS pkg-debug-tools-bash-minimal-amd64
153153
COPY --from=tools-amd64 /toolchain/bin/bash /toolchain/bin/bash
154154
COPY --from=tools-amd64 /toolchain/lib/ld-musl-x86_64.so.1 /toolchain/toolchain/lib/ld-musl-x86_64.so.1
155155
COPY --from=tools-amd64 /toolchain/bin/cat /toolchain/bin/cat
156156
COPY --from=tools-amd64 /toolchain/bin/ls /toolchain/bin/ls
157157
COPY --from=tools-amd64 /toolchain/bin/tee /toolchain/bin/tee
158158

159-
FROM scratch as pkg-debug-tools-bash-minimal-arm64
159+
FROM scratch AS pkg-debug-tools-bash-minimal-arm64
160160
COPY --from=tools-arm64 /toolchain/bin/bash /toolchain/bin/bash
161161
COPY --from=tools-arm64 /toolchain/lib/ld-musl-aarch64.so.1 /toolchain/toolchain/lib/ld-musl-aarch64.so.1
162162
COPY --from=tools-arm64 /toolchain/bin/cat /toolchain/bin/cat
163163
COPY --from=tools-arm64 /toolchain/bin/ls /toolchain/bin/ls
164164
COPY --from=tools-arm64 /toolchain/bin/tee /toolchain/bin/tee
165165

166-
FROM pkg-debug-tools-${DEBUG_TOOLS_SOURCE}-amd64 as pkg-debug-tools-amd64
167-
FROM pkg-debug-tools-${DEBUG_TOOLS_SOURCE}-arm64 as pkg-debug-tools-arm64
166+
FROM pkg-debug-tools-${DEBUG_TOOLS_SOURCE}-amd64 AS pkg-debug-tools-amd64
167+
FROM pkg-debug-tools-${DEBUG_TOOLS_SOURCE}-arm64 AS pkg-debug-tools-arm64
168168

169169
# Strip CNI package.
170170

Diff for: ‎Makefile

+8-8
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ ZSTD_COMPRESSION_LEVEL ?= 18
1717
CI_RELEASE_TAG := $(shell git log --oneline --format=%B -n 1 HEAD^2 -- 2>/dev/null | head -n 1 | sed -r "/^release\(.*\)/ s/^release\((.*)\):.*$$/\\1/; t; Q")
1818

1919
ARTIFACTS := _out
20-
TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0-alpha.0-7-g3750064
20+
TOOLS ?= ghcr.io/siderolabs/tools:v1.9.0-alpha.0-9-ge061b6f
2121

2222
DEBUG_TOOLS_SOURCE := scratch
2323

2424
PKGS_PREFIX ?= ghcr.io/siderolabs
25-
PKGS ?= v1.9.0-alpha.0-37-g4699763
26-
EXTRAS ?= v1.9.0-alpha.0-1-geab6e58
25+
PKGS ?= v1.9.0-alpha.0-40-g567a14a
26+
EXTRAS ?= v1.9.0-alpha.0-2-g78ba66b
2727

2828
KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
2929
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
@@ -65,17 +65,17 @@ PKG_TALOSCTL_CNI_BUNDLE_INSTALL ?= $(PKGS_PREFIX)/talosctl-cni-bundle-install:$(
6565
# renovate: datasource=github-tags depName=golang/go
6666
GO_VERSION ?= 1.23
6767
# renovate: datasource=go depName=golang.org/x/tools
68-
GOIMPORTS_VERSION ?= v0.26.0
68+
GOIMPORTS_VERSION ?= v0.27.0
6969
# renovate: datasource=go depName=mvdan.cc/gofumpt
7070
GOFUMPT_VERSION ?= v0.7.0
7171
# renovate: datasource=go depName=github.com/golangci/golangci-lint
72-
GOLANGCILINT_VERSION ?= v1.61.0
72+
GOLANGCILINT_VERSION ?= v1.62.0
7373
# renovate: datasource=go depName=golang.org/x/tools
74-
STRINGER_VERSION ?= v0.26.0
74+
STRINGER_VERSION ?= v0.27.0
7575
# renovate: datasource=go depName=github.com/dmarkham/enumer
7676
ENUMER_VERSION ?= v1.5.10
7777
# renovate: datasource=go depName=k8s.io/code-generator
78-
DEEPCOPY_GEN_VERSION ?= v0.31.1
78+
DEEPCOPY_GEN_VERSION ?= v0.31.2
7979
# renovate: datasource=go depName=github.com/planetscale/vtprotobuf
8080
VTPROTOBUF_VERSION ?= v0.6.0
8181
# renovate: datasource=go depName=github.com/siderolabs/deep-copy
@@ -110,7 +110,7 @@ KUBESTR_VERSION ?= v0.4.46
110110
# renovate: datasource=github-releases depName=helm/helm
111111
HELM_VERSION ?= v3.16.2
112112
# renovate: datasource=github-releases depName=cilium/cilium-cli
113-
CILIUM_CLI_VERSION ?= v0.16.19
113+
CILIUM_CLI_VERSION ?= v0.16.20
114114
# renovate: datasource=github-releases depName=microsoft/secureboot_objects
115115
MICROSOFT_SECUREBOOT_RELEASE ?= v1.1.3
116116

Diff for: ‎go.mod

+35-34
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/siderolabs/talos
22

3-
go 1.23.2
3+
go 1.23.3
44

55
replace (
66
// see e.g. https://github.com/grpc/grpc-go/issues/6696
@@ -53,12 +53,12 @@ require (
5353
cloud.google.com/go/compute/metadata v0.5.2
5454
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.16.0
5555
github.com/Azure/azure-sdk-for-go/sdk/azidentity v1.8.0
56-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates v1.2.0
57-
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.2.0
56+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azcertificates v1.3.0
57+
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/azkeys v1.3.0
5858
github.com/alexflint/go-filemutex v1.3.0
59-
github.com/aws/aws-sdk-go-v2/config v1.28.1
60-
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.18
61-
github.com/aws/aws-sdk-go-v2/service/kms v1.37.3
59+
github.com/aws/aws-sdk-go-v2/config v1.28.3
60+
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.19
61+
github.com/aws/aws-sdk-go-v2/service/kms v1.37.5
6262
github.com/aws/smithy-go v1.22.0
6363
github.com/beevik/ntp v1.4.3
6464
github.com/benbjohnson/clock v1.3.5 // project archived on 2023-05-18
@@ -69,7 +69,7 @@ require (
6969
github.com/containerd/containerd/v2 v2.0.0
7070
github.com/containerd/errdefs v1.0.0
7171
github.com/containerd/platforms v1.0.0-rc.0
72-
github.com/containerd/typeurl/v2 v2.2.2
72+
github.com/containerd/typeurl/v2 v2.2.3
7373
github.com/containernetworking/cni v1.2.3
7474
github.com/containernetworking/plugins v1.6.0
7575
github.com/coredns/coredns v1.11.3
@@ -81,7 +81,7 @@ require (
8181
github.com/docker/go-connections v0.5.0
8282
github.com/dustin/go-humanize v1.0.1
8383
github.com/ecks/uefi v0.0.0-20221116212947-caef65d070eb
84-
github.com/elastic/go-libaudit/v2 v2.5.1-0.20241104162019-1df86e79cca7
84+
github.com/elastic/go-libaudit/v2 v2.6.0
8585
github.com/fatih/color v1.18.0
8686
github.com/florianl/go-tc v0.4.4
8787
github.com/foxboron/go-uefi v0.0.0-20241017190036-fab4fdf2f2f3
@@ -97,20 +97,20 @@ require (
9797
github.com/google/go-tpm v0.9.1
9898
github.com/google/nftables v0.2.0
9999
github.com/google/uuid v1.6.0
100-
github.com/gopacket/gopacket v1.3.0
100+
github.com/gopacket/gopacket v1.3.1
101101
github.com/gosuri/uiprogress v0.0.1
102102
github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.1.0
103103
github.com/hashicorp/go-cleanhttp v0.5.2
104104
github.com/hashicorp/go-envparse v0.1.0
105105
github.com/hashicorp/go-getter/v2 v2.2.3
106106
github.com/hashicorp/go-multierror v1.1.1
107-
github.com/hetznercloud/hcloud-go/v2 v2.15.0
107+
github.com/hetznercloud/hcloud-go/v2 v2.16.0
108108
github.com/insomniacslk/dhcp v0.0.0-20240829085014-a3a4c1f04475
109109
github.com/jeromer/syslogparser v1.1.0
110110
github.com/jsimonetti/rtnetlink/v2 v2.0.2
111111
github.com/jxskiss/base62 v1.1.0
112112
github.com/klauspost/compress v1.17.11
113-
github.com/klauspost/cpuid/v2 v2.2.8
113+
github.com/klauspost/cpuid/v2 v2.2.9
114114
github.com/linode/go-metadata v0.2.1
115115
github.com/martinlindhe/base36 v1.1.1
116116
github.com/mattn/go-isatty v0.0.20
@@ -152,7 +152,7 @@ require (
152152
github.com/siderolabs/go-debug v0.4.0
153153
github.com/siderolabs/go-kmsg v0.1.4
154154
github.com/siderolabs/go-kubeconfig v0.1.0
155-
github.com/siderolabs/go-kubernetes v0.2.15
155+
github.com/siderolabs/go-kubernetes v0.2.16
156156
github.com/siderolabs/go-loadbalancer v0.3.4
157157
github.com/siderolabs/go-pcidb v0.3.0
158158
github.com/siderolabs/go-pointer v1.0.0
@@ -165,7 +165,7 @@ require (
165165
github.com/siderolabs/kms-client v0.1.0
166166
github.com/siderolabs/net v0.4.0
167167
github.com/siderolabs/proto-codec v0.1.1
168-
github.com/siderolabs/protoenc v0.2.1
168+
github.com/siderolabs/protoenc v0.2.1 // indirect
169169
github.com/siderolabs/siderolink v0.3.11
170170
github.com/siderolabs/talos/pkg/machinery v1.9.0-alpha.2
171171
github.com/spf13/cobra v1.8.1
@@ -182,31 +182,32 @@ require (
182182
go.etcd.io/etcd/etcdutl/v3 v3.5.16
183183
go.uber.org/zap v1.27.0
184184
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
185-
golang.org/x/net v0.30.0
186-
golang.org/x/oauth2 v0.23.0
187-
golang.org/x/sync v0.8.0
188-
golang.org/x/sys v0.26.0
189-
golang.org/x/term v0.25.0
190-
golang.org/x/text v0.19.0
191-
golang.org/x/time v0.7.0
185+
golang.org/x/net v0.31.0
186+
golang.org/x/oauth2 v0.24.0
187+
golang.org/x/sync v0.9.0
188+
golang.org/x/sys v0.27.0
189+
golang.org/x/term v0.26.0
190+
golang.org/x/text v0.20.0
191+
golang.org/x/time v0.8.0
192192
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
193-
google.golang.org/grpc v1.67.1 // do not update to 1.68.0 until we find a way around https://github.com/grpc/grpc-go/pull/7535
193+
google.golang.org/grpc v1.68.0 // do not update to 1.68.0 until we find a way around https://github.com/grpc/grpc-go/pull/7535
194194
google.golang.org/protobuf v1.35.1
195195
gopkg.in/yaml.v3 v3.0.1
196196
k8s.io/klog/v2 v2.130.1
197-
kernel.org/pub/linux/libs/security/libcap/cap v1.2.71
197+
kernel.org/pub/linux/libs/security/libcap/cap v1.2.72
198198
sigs.k8s.io/hydrophone v0.6.1-0.20240718103601-b92baf7e0b04
199199
sigs.k8s.io/yaml v1.4.0
200200
)
201201

202202
require (
203+
cel.dev/expr v0.18.0 // indirect
203204
github.com/0x5a17ed/itkit v0.6.0 // indirect
204205
github.com/AdaLogics/go-fuzz-headers v0.0.0-20240806141605-e8a1dd7889d6 // indirect
205206
github.com/AdamKorcz/go-118-fuzz-build v0.0.0-20231105174938-2b5cbb29f3e2 // indirect
206207
github.com/Azure/azure-sdk-for-go/sdk/internal v1.10.0 // indirect
207208
github.com/Azure/azure-sdk-for-go/sdk/security/keyvault/internal v1.1.0 // indirect
208209
github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 // indirect
209-
github.com/AzureAD/microsoft-authentication-library-for-go v1.2.2 // indirect
210+
github.com/AzureAD/microsoft-authentication-library-for-go v1.3.1 // indirect
210211
github.com/MakeNowJust/heredoc v1.0.0 // indirect
211212
github.com/Microsoft/go-winio v0.6.2 // indirect
212213
github.com/Microsoft/hcsshim v0.12.9 // indirect
@@ -217,16 +218,16 @@ require (
217218
github.com/antlr4-go/antlr/v4 v4.13.0 // indirect
218219
github.com/apparentlymart/go-cidr v1.1.0 // indirect
219220
github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2 // indirect
220-
github.com/aws/aws-sdk-go-v2 v1.32.3 // indirect
221-
github.com/aws/aws-sdk-go-v2/credentials v1.17.42 // indirect
222-
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.22 // indirect
223-
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.22 // indirect
221+
github.com/aws/aws-sdk-go-v2 v1.32.4 // indirect
222+
github.com/aws/aws-sdk-go-v2/credentials v1.17.44 // indirect
223+
github.com/aws/aws-sdk-go-v2/internal/configsources v1.3.23 // indirect
224+
github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.6.23 // indirect
224225
github.com/aws/aws-sdk-go-v2/internal/ini v1.8.1 // indirect
225226
github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.12.0 // indirect
226-
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.3 // indirect
227-
github.com/aws/aws-sdk-go-v2/service/sso v1.24.3 // indirect
228-
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.3 // indirect
229-
github.com/aws/aws-sdk-go-v2/service/sts v1.32.3 // indirect
227+
github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.12.4 // indirect
228+
github.com/aws/aws-sdk-go-v2/service/sso v1.24.5 // indirect
229+
github.com/aws/aws-sdk-go-v2/service/ssooidc v1.28.4 // indirect
230+
github.com/aws/aws-sdk-go-v2/service/sts v1.32.4 // indirect
230231
github.com/beorn7/perks v1.0.1 // indirect
231232
github.com/bgentry/go-netrc v0.0.0-20140422174119-9fd32a8b3d3d // indirect
232233
github.com/cespare/xxhash/v2 v2.3.0 // indirect
@@ -270,7 +271,7 @@ require (
270271
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
271272
github.com/golang/protobuf v1.5.4 // indirect
272273
github.com/google/btree v1.1.2 // indirect
273-
github.com/google/cel-go v0.21.0 // indirect
274+
github.com/google/cel-go v0.22.0 // indirect
274275
github.com/google/gnostic-models v0.6.8 // indirect
275276
github.com/google/go-cmp v0.6.0 // indirect
276277
github.com/google/gofuzz v1.2.0 // indirect
@@ -355,7 +356,7 @@ require (
355356
go.opentelemetry.io/otel/metric v1.31.0 // indirect
356357
go.opentelemetry.io/otel/trace v1.31.0 // indirect
357358
go.uber.org/multierr v1.11.0 // indirect
358-
golang.org/x/crypto v0.28.0 // indirect
359+
golang.org/x/crypto v0.29.0 // indirect
359360
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56 // indirect
360361
golang.org/x/mod v0.21.0 // indirect
361362
golang.org/x/tools v0.26.0 // indirect
@@ -369,7 +370,7 @@ require (
369370
k8s.io/cli-runtime v0.32.0-beta.0 // indirect
370371
k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2 // indirect
371372
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
372-
kernel.org/pub/linux/libs/security/libcap/psx v1.2.71 // indirect
373+
kernel.org/pub/linux/libs/security/libcap/psx v1.2.72 // indirect
373374
rsc.io/qr v0.2.0 // indirect
374375
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
375376
sigs.k8s.io/knftables v0.0.17 // indirect

0 commit comments

Comments
 (0)