Skip to content

Commit

Permalink
chore: update Go to 1.22.0
Browse files Browse the repository at this point in the history
Finally!

Signed-off-by: Andrey Smirnov <[email protected]>
  • Loading branch information
smira committed Feb 12, 2024
1 parent 76b50fc commit a1ec170
Show file tree
Hide file tree
Showing 52 changed files with 2,106 additions and 384 deletions.
3 changes: 1 addition & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ FROM --platform=${BUILDPLATFORM} $TOOLS AS tools
ENV PATH /toolchain/bin:/toolchain/go/bin
ENV LD_LIBRARY_PATH /toolchain/lib
ENV GOTOOLCHAIN local
ENV GOEXPERIMENT loopvar
RUN ["/toolchain/bin/mkdir", "/bin", "/tmp"]
RUN ["/toolchain/bin/ln", "-svf", "/toolchain/bin/bash", "/bin/sh"]
RUN ["/toolchain/bin/ln", "-svf", "/toolchain/etc/ssl", "/etc/ssl"]
Expand All @@ -147,7 +146,7 @@ ARG STRINGER_VERSION
RUN --mount=type=cache,target=/.cache go install golang.org/x/tools/cmd/stringer@${STRINGER_VERSION} \
&& mv /go/bin/stringer /toolchain/go/bin/stringer
ARG ENUMER_VERSION
RUN --mount=type=cache,target=/.cache go install github.com/alvaroloes/enumer@${ENUMER_VERSION} \
RUN --mount=type=cache,target=/.cache go install github.com/dmarkham/enumer@${ENUMER_VERSION} \
&& mv /go/bin/enumer /toolchain/go/bin/enumer
ARG DEEPCOPY_GEN_VERSION
RUN --mount=type=cache,target=/.cache go install k8s.io/code-generator/cmd/deepcopy-gen@${DEEPCOPY_GEN_VERSION} \
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ NAME = Talos
CLOUD_IMAGES_EXTRA_ARGS ?= ""

ARTIFACTS := _out
TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0-5-gf4b41d1
TOOLS ?= ghcr.io/siderolabs/tools:v1.7.0-alpha.0-6-gb6b4d9e

PKGS_PREFIX ?= ghcr.io/siderolabs
PKGS ?= v1.7.0-alpha.0-19-g96cc841
EXTRAS ?= v1.7.0-alpha.0
PKGS ?= v1.7.0-alpha.0-22-g0ec4cc3
EXTRAS ?= v1.7.0-alpha.0-1-gc4934e1

PKG_FHS ?= $(PKGS_PREFIX)/fhs:$(PKGS)
PKG_CA_CERTIFICATES ?= $(PKGS_PREFIX)/ca-certificates:$(PKGS)
Expand Down Expand Up @@ -51,7 +51,7 @@ PKG_KERNEL ?= $(PKGS_PREFIX)/kernel:$(PKGS)
PKG_TALOSCTL_CNI_BUNDLE_INSTALL ?= $(PKGS_PREFIX)/talosctl-cni-bundle-install:$(EXTRAS)

# renovate: datasource=github-tags depName=golang/go
GO_VERSION ?= 1.21
GO_VERSION ?= 1.22
# renovate: datasource=go depName=golang.org/x/tools
GOIMPORTS_VERSION ?= v0.17.0
# renovate: datasource=go depName=mvdan.cc/gofumpt
Expand All @@ -60,16 +60,16 @@ GOFUMPT_VERSION ?= v0.6.0
GOLANGCILINT_VERSION ?= v1.56.1
# renovate: datasource=go depName=golang.org/x/tools
STRINGER_VERSION ?= v0.17.0
# renovate: datasource=go depName=github.com/alvaroloes/enumer
ENUMER_VERSION ?= v1.1.2
# renovate: datasource=go depName=github.com/dmarkham/enumer
ENUMER_VERSION ?= v1.5.9
# renovate: datasource=go depName=k8s.io/code-generator
DEEPCOPY_GEN_VERSION ?= v0.29.1
# renovate: datasource=go depName=github.com/planetscale/vtprotobuf
VTPROTOBUF_VERSION ?= v0.6.0
# renovate: datasource=go depName=github.com/siderolabs/deep-copy
DEEPCOPY_VERSION ?= v0.5.5
DEEPCOPY_VERSION ?= v0.5.6
# renovate: datasource=go depName=github.com/siderolabs/importvet
IMPORTVET_VERSION ?= v0.1.0
IMPORTVET_VERSION ?= v0.2.0
# renovate: datasource=npm depName=markdownlint-cli
MARKDOWNLINTCLI_VERSION ?= 0.39.0
# renovate: datasource=npm depName=textlint
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/talos

go 1.21.6
go 1.22.0

replace (
// forked coredns so we don't carry caddy and other stuff into the Talos
Expand Down
2 changes: 1 addition & 1 deletion go.work
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
go 1.21.6
go 1.22.0

use (
.
Expand Down
2 changes: 1 addition & 1 deletion hack/cloud-image-uploader/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/cloud-image-uploader

go 1.21.6
go 1.22.0

require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible
Expand Down
2 changes: 1 addition & 1 deletion hack/docgen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/talos-hack-docgen

go 1.21.6
go 1.22.0

// forked go-yaml that introduces RawYAML interface, which can be used to populate YAML fields using bytes
// which are then encoded as a valid YAML blocks with proper indentiation
Expand Down
2 changes: 1 addition & 1 deletion hack/gotagsrewrite/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/gotagsrewrite

go 1.21.6
go 1.22.0

require (
github.com/fatih/structtag v1.2.0
Expand Down
2 changes: 1 addition & 1 deletion hack/module-sig-verify/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module module-sig-verify

go 1.21.6
go 1.22.0

require go.mozilla.org/pkcs7 v0.0.0-20210826202110-33d05740a352
4 changes: 2 additions & 2 deletions hack/release.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ preface = """\
[notes.updates]
title = "Component Updates"
description = """\
Linux: 6.6.14
Linux: 6.6.16
etcd: 3.5.11
Kubernetes: 1.29.1
containerd: 1.7.13
runc: 1.1.12
Flannel: 0.24.1
Talos is built with Go 1.21.6.
Talos is built with Go 1.22.0.
"""

[notes.device_selectors]
Expand Down
2 changes: 1 addition & 1 deletion hack/structprotogen/go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/siderolabs/structprotogen

go 1.21.6
go 1.22.0

require (
github.com/fatih/structtag v1.2.0
Expand Down
50 changes: 44 additions & 6 deletions pkg/imager/profile/diskformat_enumer.go

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

50 changes: 44 additions & 6 deletions pkg/imager/profile/outformat_enumer.go

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

Loading

0 comments on commit a1ec170

Please sign in to comment.