Skip to content

Commit 6063fbf

Browse files
committed
feat: update dependencies
Many small changes, linting fixes, migration to moby/moby client package. Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
1 parent 542a67a commit 6063fbf

File tree

129 files changed

+1093
-2253
lines changed

Some content is hidden

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

129 files changed

+1093
-2253
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# syntax = docker/dockerfile-upstream:1.19.0-labs
1+
# syntax = docker/dockerfile-upstream:1.20.0-labs
22

33
# Meta args applied to stage base names.
44

Makefile

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ DEBUG_TOOLS_SOURCE := scratch
2525
EMBED_TARGET ?= embed
2626

2727
TOOLS_PREFIX ?= ghcr.io/siderolabs/tools
28-
TOOLS ?= v1.12.0-alpha.0-18-g44932c0
28+
TOOLS ?= v1.12.0
2929
PKGS_PREFIX ?= ghcr.io/siderolabs
30-
PKGS ?= v1.12.0-alpha.0-52-g1768ccf
30+
PKGS ?= v1.12.0
3131
GENERATE_VEX_PREFIX ?= ghcr.io/siderolabs/generate-vex
3232
GENERATE_VEX ?= latest
3333

@@ -104,9 +104,9 @@ KUBECTL_VERSION ?= v1.35.0-alpha.3
104104
# renovate: datasource=github-releases depName=kastenhq/kubestr
105105
KUBESTR_VERSION ?= v0.4.49
106106
# renovate: datasource=github-releases depName=helm/helm
107-
HELM_VERSION ?= v3.19.0
107+
HELM_VERSION ?= v4.0.0
108108
# renovate: datasource=github-releases depName=cilium/cilium-cli
109-
CILIUM_CLI_VERSION ?= v0.18.7
109+
CILIUM_CLI_VERSION ?= v0.18.8
110110
# renovate: datasource=github-releases depName=microsoft/secureboot_objects
111111
MICROSOFT_SECUREBOOT_RELEASE ?= v1.1.3
112112

cmd/installer/pkg/install/install.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func Install(ctx context.Context, p runtime.Platform, mode Mode, opts *Options)
142142

143143
var b runtime.Board
144144

145-
b, err := board.NewBoard(opts.Board)
145+
b, err := board.NewBoard(opts.Board) //nolint:staticcheck
146146
if err != nil {
147147
return err
148148
}
@@ -364,7 +364,7 @@ func (i *Installer) Install(ctx context.Context, mode Mode) (err error) {
364364
if i.options.Board != constants.BoardNone {
365365
var b runtime.Board
366366

367-
b, err = board.NewBoard(i.options.Board)
367+
b, err = board.NewBoard(i.options.Board) //nolint:staticcheck
368368
if err != nil {
369369
return err
370370
}
@@ -454,7 +454,7 @@ func (i *Installer) createPartitions(ctx context.Context, gptdev gpt.Device, mod
454454
if i.options.Board != constants.BoardNone && !quirks.New(i.options.Version).SupportsOverlay() {
455455
var b runtime.Board
456456

457-
b, err := board.NewBoard(i.options.Board)
457+
b, err := board.NewBoard(i.options.Board) //nolint:staticcheck
458458
if err != nil {
459459
return nil, err
460460
}

cmd/talosctl/cmd/mgmt/cluster/create/cmd_dev.go

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import (
99
"fmt"
1010
"runtime"
1111
"slices"
12+
"strings"
1213

1314
"github.com/spf13/cobra"
1415
"github.com/spf13/pflag"
@@ -276,7 +277,8 @@ func getCreateCmd(cmdName string, hidden bool) *cobra.Command {
276277
return err
277278
}
278279

279-
disks := fmt.Sprintf("virtio:%d", legacyOps.clusterDiskSize)
280+
var disks strings.Builder
281+
disks.WriteString(fmt.Sprintf("virtio:%d", legacyOps.clusterDiskSize))
280282

281283
for i := range legacyOps.extraDisks {
282284
driver := "ide"
@@ -290,12 +292,12 @@ func getCreateCmd(cmdName string, hidden bool) *cobra.Command {
290292
driver = legacyOps.extraDisksDrivers[i]
291293
}
292294

293-
disks += fmt.Sprintf(",%s:%d", driver, legacyOps.extraDiskSize)
295+
disks.WriteString(fmt.Sprintf(",%s:%d", driver, legacyOps.extraDiskSize))
294296
}
295297

296298
qOps.Disks = flags.Disks{}
297299

298-
if err := qOps.Disks.Set(disks); err != nil {
300+
if err := qOps.Disks.Set(disks.String()); err != nil {
299301
return err
300302
}
301303

cmd/talosctl/cmd/mgmt/cluster/create/cmd_qemu.go

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ package create
66

77
import (
88
"context"
9+
"strings"
910

1011
"github.com/spf13/cobra"
1112
"github.com/spf13/pflag"
@@ -46,19 +47,21 @@ func init() {
4647
return qemu
4748
}
4849

49-
cmdDescription := "Create a local QEMU based Talos cluster\n"
50+
var cmdDescription strings.Builder
51+
cmdDescription.WriteString("Create a local QEMU based Talos cluster\n")
52+
53+
cmdDescription.WriteString("Available presets:\n")
5054

51-
cmdDescription += "Available presets:\n"
5255
for _, p := range preset.Presets {
53-
cmdDescription += " - " + p.Name() + ": " + p.Description() + "\n"
56+
cmdDescription.WriteString(" - " + p.Name() + ": " + p.Description() + "\n")
5457
}
5558

56-
cmdDescription += "\n"
57-
cmdDescription += "Note: exactly one of 'iso', 'iso-secureboot', 'pxe' or 'disk-image' presets must be specified.\n"
59+
cmdDescription.WriteString("\n")
60+
cmdDescription.WriteString("Note: exactly one of 'iso', 'iso-secureboot', 'pxe' or 'disk-image' presets must be specified.\n")
5861

5962
createQemuCmd := &cobra.Command{
6063
Use: providers.QemuProviderName,
61-
Short: cmdDescription,
64+
Short: cmdDescription.String(),
6265
Args: cobra.NoArgs,
6366
RunE: func(cmd *cobra.Command, args []string) error {
6467
return cli.WithContext(context.Background(), func(ctx context.Context) error {

cmd/talosctl/cmd/talos/cgroupsprinter/tree.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,13 @@ const (
2929
//
3030
//nolint:gocyclo
3131
func PrintNode(name string, w io.Writer, schema *Schema, node, parent *cgroups.Node, level int, levelsEnded []int, lastNode, treeRoot bool) error {
32-
var prefix string
32+
var prefix strings.Builder
3333

3434
for i := range level {
3535
if slices.Index(levelsEnded, i) != -1 {
36-
prefix += strings.Repeat(" ", indentSize+1)
36+
prefix.WriteString(strings.Repeat(" ", indentSize+1))
3737
} else {
38-
prefix += string(edgeTypeLink) + strings.Repeat(" ", indentSize)
38+
prefix.WriteString(string(edgeTypeLink) + strings.Repeat(" ", indentSize))
3939
}
4040
}
4141

@@ -62,7 +62,7 @@ func PrintNode(name string, w io.Writer, schema *Schema, node, parent *cgroups.N
6262
return err
6363
}
6464

65-
_, err = fmt.Fprintf(w, "%s%s%s\t%s\n", prefix, edge, name, rowData)
65+
_, err = fmt.Fprintf(w, "%s%s%s\t%s\n", prefix.String(), edge, name, rowData)
6666
if err != nil {
6767
return err
6868
}

cmd/talosctl/cmd/talos/pcap.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ func parseBPFInstructions(in string) ([]*machine.BPFInstruction, error) {
174174

175175
var result []*machine.BPFInstruction //nolint:prealloc
176176

177-
for _, line := range strings.Split(in, "\n") {
177+
for line := range strings.SplitSeq(in, "\n") {
178178
if line == "" {
179179
continue
180180
}

0 commit comments

Comments
 (0)