Skip to content

Commit

Permalink
chore: update pkgs/tools/extras
Browse files Browse the repository at this point in the history
This brings in Go 1.22.5 and new Flannel CNI plugin.

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Jul 3, 2024
1 parent 93df234 commit be35f38
Show file tree
Hide file tree
Showing 47 changed files with 459 additions and 456 deletions.
1 change: 1 addition & 0 deletions .github/workflows/lock.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,4 @@ jobs:
with:
issue-inactive-days: '60'
process-only: 'issues'
log-output: true
1 change: 1 addition & 0 deletions .github/workflows/stale.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ jobs:
days-before-pr-stale: 45
days-before-issue-close: 5
days-before-pr-close: -1 # never close PRs
operations-per-run: 2000 # the maximum number of operations to perform per run
8 changes: 4 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
ZSTD_COMPRESSION_LEVEL ?= 18

ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-5-gd2746e5
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-6-g31ad71b

PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.8.0-alpha.0-32-g8d6b19a
EXTRAS ?= v1.8.0-alpha.0-2-g0efb05f
PKGS ?= v1.8.0-alpha.0-34-gce49757
EXTRAS ?= v1.8.0-alpha.0-3-gcab51d8

KRES_IMAGE ?= ghcr.io/siderolabs/kres:latest
CONFORMANCE_IMAGE ?= ghcr.io/siderolabs/conform:latest
Expand Down Expand Up @@ -59,7 +59,7 @@ GOIMPORTS_VERSION ?= v0.21.0
# renovate: datasource=go depName=mvdan.cc/gofumpt
GOFUMPT_VERSION ?= v0.6.0
# renovate: datasource=go depName=github.com/golangci/golangci-lint
GOLANGCILINT_VERSION ?= v1.59.0
GOLANGCILINT_VERSION ?= v1.59.1
# renovate: datasource=go depName=golang.org/x/tools
STRINGER_VERSION ?= v0.21.0
# renovate: datasource=go depName=github.com/dmarkham/enumer
Expand Down
Binary file modified api/api.descriptors
Binary file not shown.
2 changes: 1 addition & 1 deletion cmd/installer/pkg/install/errata.go
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ func upgradeFromPreIfnamesTalos() (bool, error) {

if _, err := os.Stat(constants.MachineSocketPath); err != nil {
// old Talos version, include fallback
return true, nil //nolint:nilerr
return true, nil
}

c, err := client.New(ctx,
Expand Down
2 changes: 1 addition & 1 deletion cmd/installer/pkg/install/manifest.go
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ func (m *Manifest) checkMounts(device Device) error {
f, err = os.Open(path)
if err != nil {
// ignore error in case process got removed
return nil //nolint:nilerr
return nil
}

defer f.Close() //nolint:errcheck
Expand Down
3 changes: 2 additions & 1 deletion hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,9 @@ containerd: 2.0.0-rc.3
runc: 1.2.0-rc.2
etcd: 3.5.14
Flannel: 0.25.3
Flannel CNI plugin: 1.5.1
Talos is built with Go 1.22.4.
Talos is built with Go 1.22.5.
"""

[notes.apparmor]
Expand Down
2 changes: 1 addition & 1 deletion internal/app/machined/pkg/controllers/block/disks.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ func (ctrl *DisksController) analyzeBlockDevice(ctx context.Context, r controlle

size, err := bd.GetSize()
if err != nil || size == 0 {
return nil //nolint:nilerr
return nil
}

if privateDM, _ := bd.IsPrivateDeviceMapper(); privateDM { //nolint:errcheck
Expand Down
12 changes: 6 additions & 6 deletions pkg/machinery/api/cluster/cluster.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/machinery/api/cluster/cluster_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 16 additions & 16 deletions pkg/machinery/api/common/common.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions pkg/machinery/api/inspect/inspect.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion pkg/machinery/api/inspect/inspect_grpc.pb.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit be35f38

Please sign in to comment.