Skip to content

Commit

Permalink
chore: update Go to 1.22.3
Browse files Browse the repository at this point in the history
Also bump dependencies.

Signed-off-by: Andrey Smirnov <andrey.smirnov@siderolabs.com>
  • Loading branch information
smira committed May 8, 2024
1 parent f4d7b9d commit 1d29111
Show file tree
Hide file tree
Showing 27 changed files with 93 additions and 88 deletions.
2 changes: 1 addition & 1 deletion .drone.jsonnet
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ local TriggerDownstream(name, target, repositories, image='', params=[], depends
// This provides the docker service.
local docker = {
name: 'docker',
image: 'docker:25.0.2-dind',
image: 'docker:26.1-dind',
entrypoint: ['dockerd'],
privileged: true,
command: [
Expand Down
3 changes: 2 additions & 1 deletion .golangci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ linters:
enable-all: true
disable:
- errorlint
- err113
- exhaustruct
- exhaustivestruct
- forbidigo
Expand All @@ -115,11 +116,11 @@ linters:
- gochecknoinits
- gocognit
- godox
- goerr113
- gomnd
- gosec
- ireturn # we return interfaces
- maintidx
- mnd
- nestif
- nilnil # we return "nil, nil"
- nonamedreturns
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# syntax = docker/dockerfile-upstream:1.7.0-labs
# syntax = docker/dockerfile-upstream:1.7.1-labs

# Meta args applied to stage base names.

Expand Down Expand Up @@ -962,7 +962,7 @@ RUN --mount=type=cache,target=/.cache prototool break check --descriptor-set-pat

# The markdownlint target performs linting on Markdown files.

FROM node:21.7.3-alpine AS lint-markdown
FROM node:22.1.0-alpine AS lint-markdown
ARG MARKDOWNLINTCLI_VERSION
ARG TEXTLINT_VERSION
ARG TEXTLINT_FILTER_RULE_COMMENTS_VERSION
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ CLOUD_IMAGES_EXTRA_ARGS ?= ""
ZSTD_COMPRESSION_LEVEL ?= 18

ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0
TOOLS ?= ghcr.io/siderolabs/tools:v1.8.0-alpha.0-2-gc34ec5b

PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.8.0-alpha.0-10-g28c5696
EXTRAS ?= v1.8.0-alpha.0
PKGS ?= v1.8.0-alpha.0-13-gbd70572
EXTRAS ?= v1.8.0-alpha.0-1-g01ad9f5

PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS)
PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS)
Expand Down Expand Up @@ -56,7 +56,7 @@ GOIMPORTS_VERSION ?= v0.20.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.57.2
GOLANGCILINT_VERSION ?= v1.58.0
# renovate: datasource=go depName=golang.org/x/tools
STRINGER_VERSION ?= v0.19.0
# renovate: datasource=go depName=github.com/dmarkham/enumer
Expand All @@ -70,7 +70,7 @@ DEEPCOPY_VERSION ?= v0.5.6
# renovate: datasource=go depName=github.com/siderolabs/importvet
IMPORTVET_VERSION ?= v0.2.0
# renovate: datasource=npm depName=markdownlint-cli
MARKDOWNLINTCLI_VERSION ?= 0.39.0
MARKDOWNLINTCLI_VERSION ?= 0.40.0
# renovate: datasource=npm depName=textlint
TEXTLINT_VERSION ?= 14.0.4
# renovate: datasource=npm depName=textlint-filter-rule-comments
Expand All @@ -91,11 +91,11 @@ KUBECTL_VERSION ?= v1.30.0
# renovate: datasource=github-releases depName=kastenhq/kubestr
KUBESTR_VERSION ?= v0.4.44
# renovate: datasource=github-releases depName=helm/helm
HELM_VERSION ?= v3.14.3
HELM_VERSION ?= v3.14.4
# renovate: datasource=github-releases depName=kubernetes-sigs/cluster-api
CLUSTERCTL_VERSION ?= 1.6.3
CLUSTERCTL_VERSION ?= 1.7.1
# renovate: datasource=github-releases depName=cilium/cilium-cli
CILIUM_CLI_VERSION ?= v0.16.4
CILIUM_CLI_VERSION ?= v0.16.7
KUBECTL_URL ?= https://dl.k8s.io/release/$(KUBECTL_VERSION)/bin/$(OPERATING_SYSTEM)/amd64/kubectl
KUBESTR_URL ?= https://github.com/kastenhq/kubestr/releases/download/$(KUBESTR_VERSION)/kubestr_$(subst v,,$(KUBESTR_VERSION))_Linux_amd64.tar.gz
HELM_URL ?= https://get.helm.sh/helm-$(HELM_VERSION)-linux-amd64.tar.gz
Expand Down
32 changes: 16 additions & 16 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/talos

go 1.22.2
go 1.22.3

replace (
// forked coredns so we don't carry caddy and other stuff into the Talos
Expand Down Expand Up @@ -49,7 +49,7 @@ require (
github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.16.1
github.com/aws/aws-sdk-go-v2/service/kms v1.31.0
github.com/aws/smithy-go v1.20.2
github.com/beevik/ntp v1.3.1
github.com/beevik/ntp v1.4.1
github.com/benbjohnson/clock v1.3.5 // project archived on 2023-05-18
github.com/blang/semver/v4 v4.0.0
github.com/cenkalti/backoff/v4 v4.3.0
Expand All @@ -60,9 +60,9 @@ require (
github.com/containernetworking/plugins v1.4.1
github.com/coredns/coredns v1.11.2
github.com/coreos/go-iptables v0.7.0
github.com/cosi-project/runtime v0.4.1
github.com/cosi-project/runtime v0.4.2
github.com/distribution/reference v0.6.0
github.com/docker/docker v26.0.2+incompatible
github.com/docker/docker v26.1.1+incompatible
github.com/docker/go-connections v0.5.0
github.com/dustin/go-humanize v1.0.1
github.com/ecks/uefi v0.0.0-20221116212947-caef65d070eb
Expand All @@ -87,7 +87,7 @@ require (
github.com/hashicorp/go-envparse v0.1.0
github.com/hashicorp/go-getter/v2 v2.2.1
github.com/hashicorp/go-multierror v1.1.1
github.com/hetznercloud/hcloud-go/v2 v2.7.2
github.com/hetznercloud/hcloud-go/v2 v2.8.0
github.com/insomniacslk/dhcp v0.0.0-20240419123447-f1cffa2c0c49
github.com/jeromer/syslogparser v1.1.0
github.com/jsimonetti/rtnetlink v1.4.1
Expand All @@ -114,7 +114,7 @@ require (
github.com/pin/tftp/v3 v3.1.0
github.com/pmorjan/kmod v1.1.1
github.com/prometheus/procfs v0.14.0
github.com/rivo/tview v0.0.0-20240420134618-e119d15762fe
github.com/rivo/tview v0.0.0-20240505185119-ed116790de0f
github.com/rs/xid v1.5.0
github.com/ryanuber/columnize v2.1.2+incompatible
github.com/ryanuber/go-glob v1.0.0
Expand Down Expand Up @@ -145,7 +145,7 @@ require (
github.com/siderolabs/grpc-proxy v0.4.0
github.com/siderolabs/kms-client v0.1.0
github.com/siderolabs/net v0.4.0
github.com/siderolabs/siderolink v0.3.5
github.com/siderolabs/siderolink v0.3.6
github.com/siderolabs/talos/pkg/machinery v1.8.0-alpha.0
github.com/spf13/cobra v1.8.0
github.com/spf13/pflag v1.0.5
Expand All @@ -162,16 +162,16 @@ require (
go.etcd.io/etcd/etcdutl/v3 v3.5.13
go.uber.org/zap v1.27.0
go4.org/netipx v0.0.0-20231129151722-fdeea329fbba
golang.org/x/net v0.24.0
golang.org/x/oauth2 v0.19.0
golang.org/x/net v0.25.0
golang.org/x/oauth2 v0.20.0
golang.org/x/sync v0.7.0
golang.org/x/sys v0.19.0
golang.org/x/term v0.19.0
golang.org/x/text v0.14.0
golang.org/x/sys v0.20.0
golang.org/x/term v0.20.0
golang.org/x/text v0.15.0
golang.org/x/time v0.5.0
golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230429144221-925a1e7659e6
google.golang.org/grpc v1.63.2
google.golang.org/protobuf v1.33.0
google.golang.org/protobuf v1.34.1
gopkg.in/yaml.v3 v3.0.1
k8s.io/klog/v2 v2.120.1
kernel.org/pub/linux/libs/security/libcap/cap v1.2.69
Expand Down Expand Up @@ -341,15 +341,15 @@ require (
go.opentelemetry.io/otel/trace v1.22.0 // indirect
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.22.0 // indirect
golang.org/x/exp v0.0.0-20240222234643-814bf88cf225 // indirect
golang.org/x/crypto v0.23.0 // indirect
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f // indirect
golang.org/x/mod v0.17.0 // indirect
golang.org/x/tools v0.20.0 // indirect
golang.zx2c4.com/wintun v0.0.0-20230126152724-0fa3db229ce2 // indirect
golang.zx2c4.com/wireguard v0.0.0-20231211153847-12269c276173 // indirect
google.golang.org/genproto v0.0.0-20240227224415-6ceb2ff114de // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240401170217-c3f982113cda // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240506185236-b8a5c65736ae // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/ini.v1 v1.67.0 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
Expand Down
Loading

0 comments on commit 1d29111

Please sign in to comment.