From ed5af3f780732fb0004ddb263feedbf2de9fd09a Mon Sep 17 00:00:00 2001 From: Noel Georgi Date: Thu, 16 Feb 2023 16:08:22 +0530 Subject: [PATCH] chore: bump deps Bump Go to 1.20.1 Bump containerd to 1.6.18 Bump kernel to 6.1.12 Bump go deps and enable renovate updates for markdown lint tools. Signed-off-by: Noel Georgi --- .github/renovate.json | 11 ++++++++ Dockerfile | 16 +++++++----- Makefile | 26 ++++++++++++++----- go.mod | 10 +++---- go.sum | 16 ++++++------ hack/cloud-image-uploader/go.mod | 4 +-- hack/cloud-image-uploader/go.sum | 4 +-- hack/docgen/go.mod | 2 +- hack/gotagsrewrite/go.mod | 2 +- hack/release.toml | 6 ++--- hack/structprotogen/go.mod | 2 +- package.json | 2 +- pkg/machinery/constants/constants.go | 6 ++--- pkg/machinery/gendata/data/extras | 2 +- pkg/machinery/gendata/data/pkgs | 2 +- pkg/machinery/go.mod | 4 +-- pkg/machinery/go.sum | 4 +-- pkg/startup/rand.go | 1 + .../v1.0/introduction/getting-started.md | 2 +- .../v1.0/talos-guides/upgrading-talos.md | 2 +- .../v1.1/introduction/getting-started.md | 2 +- .../v1.1/talos-guides/upgrading-talos.md | 2 +- .../v1.2/introduction/getting-started.md | 4 +-- .../v1.2/talos-guides/upgrading-talos.md | 2 +- .../v1.3/introduction/getting-started.md | 4 +-- .../v1.3/talos-guides/upgrading-talos.md | 2 +- .../v1.4/introduction/getting-started.md | 4 +-- .../v1.4/talos-guides/upgrading-talos.md | 2 +- 28 files changed, 87 insertions(+), 59 deletions(-) diff --git a/.github/renovate.json b/.github/renovate.json index 19a6c99eb..a3506bb34 100644 --- a/.github/renovate.json +++ b/.github/renovate.json @@ -25,6 +25,17 @@ "\\/\\/\\s+renovate: datasource=(?.*?)(?:\\s+extractVersion=(?.+?))?(?:\\s+versioning=(?.+?))?\\s+depName=(?.+?)?\\s.*Version\\s+=\\s+\\\"(?.+?)\\\"" ], "versioningTemplate": "{{#if versioning}}{{versioning}}{{else}}semver{{/if}}" + }, + { + "fileMatch": [ + "Dockerfile" + ], + "matchStrings": [ + "# syntax = docker\\/dockerfile-upstream:(?.*)" + ], + "depNameTemplate": "docker/dockerfile-upstream", + "datasourceTemplate": "docker", + "versioningTemplate": "docker" } ], "packageRules": [ diff --git a/Dockerfile b/Dockerfile index 97924006c..e967f9adc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -# syntax = docker/dockerfile-upstream:1.2.0-labs +# syntax = docker/dockerfile-upstream:1.5.2-labs # Meta args applied to stage base names. @@ -87,7 +87,7 @@ FROM ghcr.io/siderolabs/talosctl-cni-bundle-install:${EXTRAS} AS extras-talosctl # The tools target provides base toolchain for the build. -FROM $IMPORTVET as importvet +FROM --platform=${BUILDPLATFORM} $IMPORTVET as importvet FROM --platform=${BUILDPLATFORM} $TOOLS AS tools ENV PATH /toolchain/bin:/toolchain/go/bin @@ -787,11 +787,15 @@ RUN --mount=type=cache,target=/.cache prototool break check --descriptor-set-pat # The markdownlint target performs linting on Markdown files. FROM node:19.6.0-alpine AS lint-markdown +ARG MARKDOWNLINTCLI_VERSION +ARG TEXTLINT_VERSION +ARG TEXTLINT_FILTER_RULE_COMMENTS_VERSION +ARG TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION RUN apk add --no-cache findutils -RUN npm i -g markdownlint-cli@0.23.2 -RUN npm i -g textlint@11.7.6 -RUN npm i -g textlint-filter-rule-comments@1.2.2 -RUN npm i -g textlint-rule-one-sentence-per-line@1.0.2 +RUN npm i -g markdownlint-cli@${MARKDOWNLINTCLI_VERSION} +RUN npm i -g textlint@${TEXTLINT_VERSION} +RUN npm i -g textlint-filter-rule-comments@${TEXTLINT_FILTER_RULE_COMMENTS_VERSION} +RUN npm i -g textlint-rule-one-sentence-per-line@${TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION} WORKDIR /src COPY . . RUN markdownlint \ diff --git a/Makefile b/Makefile index a502df3e8..fbb8a5187 100644 --- a/Makefile +++ b/Makefile @@ -13,11 +13,11 @@ DOCKER_LOGIN_ENABLED ?= true NAME = Talos ARTIFACTS := _out -TOOLS ?= ghcr.io/siderolabs/tools:v1.4.0-alpha.0-11-g28d4a57 -PKGS ?= v1.4.0-alpha.0-21-g1fae0b2 -EXTRAS ?= v1.4.0-alpha.0-2-g8cb4792 +TOOLS ?= ghcr.io/siderolabs/tools:v1.4.0-alpha.0-17-gcd9687b +PKGS ?= v1.4.0-alpha.0-26-g185f482 +EXTRAS ?= v1.4.0-alpha.0-5-g8b28b6b # renovate: datasource=github-tags depName=golang/go -GO_VERSION ?= 1.19 +GO_VERSION ?= 1.20 # renovate: datasource=go depName=golang.org/x/tools GOIMPORTS_VERSION ?= v0.6.0 # renovate: datasource=go depName=mvdan.cc/gofumpt @@ -34,7 +34,15 @@ DEEPCOPY_GEN_VERSION ?= v0.26.1 VTPROTOBUF_VERSION ?= v0.4.0 # renovate: datasource=go depName=github.com/siderolabs/deep-copy DEEPCOPY_VERSION ?= v0.5.5 -IMPORTVET ?= ghcr.io/siderolabs/importvet:1549a5c +IMPORTVET ?= ghcr.io/siderolabs/importvet:2260533 +# renovate: datasource=npm depName=markdownlint-cli +MARKDOWNLINTCLI_VERSION ?= 0.33.0 +# renovate: datasource=npm depName=textlint +TEXTLINT_VERSION ?= 13.3.0 +# renovate: datasource=npm depName=textlint-filter-rule-comments +TEXTLINT_FILTER_RULE_COMMENTS_VERSION ?= 1.2.2 +# renovate: datasource=npm depName=textlint-rule-one-sentence-per-line +TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION ?= 2.0.0 OPERATING_SYSTEM := $(shell uname -s | tr "[:upper:]" "[:lower:]") TALOSCTL_DEFAULT_TARGET := talosctl-$(OPERATING_SYSTEM) INTEGRATION_TEST_DEFAULT_TARGET := integration-test-$(OPERATING_SYSTEM) @@ -42,7 +50,7 @@ INTEGRATION_TEST_PROVISION_DEFAULT_TARGET := integration-test-provision-$(OPERAT # renovate: datasource=github-releases depName=kubernetes/kubernetes KUBECTL_VERSION ?= v1.26.1 # renovate: datasource=github-releases depName=kastenhq/kubestr -KUBESTR_VERSION ?= v0.4.36 +KUBESTR_VERSION ?= v0.4.37 # renovate: datasource=github-releases depName=helm/helm HELM_VERSION ?= v3.11.1 # renovate: datasource=github-releases depName=kubernetes-sigs/cluster-api @@ -101,6 +109,10 @@ COMMON_ARGS += --build-arg=DEEPCOPY_GEN_VERSION=$(DEEPCOPY_GEN_VERSION) COMMON_ARGS += --build-arg=VTPROTOBUF_VERSION=$(VTPROTOBUF_VERSION) COMMON_ARGS += --build-arg=GOLANGCILINT_VERSION=$(GOLANGCILINT_VERSION) COMMON_ARGS += --build-arg=DEEPCOPY_VERSION=$(DEEPCOPY_VERSION) +COMMON_ARGS += --build-arg=MARKDOWNLINTCLI_VERSION=$(MARKDOWNLINTCLI_VERSION) +COMMON_ARGS += --build-arg=TEXTLINT_VERSION=$(TEXTLINT_VERSION) +COMMON_ARGS += --build-arg=TEXTLINT_FILTER_RULE_COMMENTS_VERSION=$(TEXTLINT_FILTER_RULE_COMMENTS_VERSION) +COMMON_ARGS += --build-arg=TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION=$(TEXTLINT_RULE_ONE_SENTENCE_PER_LINE_VERSION) COMMON_ARGS += --build-arg=TAG=$(TAG) COMMON_ARGS += --build-arg=SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH) COMMON_ARGS += --build-arg=ARTIFACTS=$(ARTIFACTS) @@ -424,7 +436,7 @@ release-artifacts: .PHONY: conformance conformance: ## Performs policy checks against the commit and source code. - docker run --rm -it -v $(PWD):/src -w /src ghcr.io/siderolabs/conform:v0.1.0-alpha.22 enforce + docker run --rm -it -v $(PWD):/src -w /src ghcr.io/siderolabs/conform:latest enforce .PHONY: release-notes release-notes: diff --git a/go.mod b/go.mod index abeaea84b..3e398e5d5 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos -go 1.19 +go 1.20 replace ( // Use nested module. @@ -30,17 +30,17 @@ require ( require ( cloud.google.com/go/compute/metadata v0.2.3 github.com/BurntSushi/toml v1.2.1 - github.com/aws/aws-sdk-go v1.44.201 + github.com/aws/aws-sdk-go v1.44.202 github.com/beevik/ntp v0.3.0 github.com/cenkalti/backoff/v4 v4.2.0 github.com/containerd/cgroups v1.1.0 - github.com/containerd/containerd v1.6.17 + github.com/containerd/containerd v1.6.18 github.com/containerd/typeurl v1.0.2 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.2.0 github.com/coreos/go-iptables v0.6.0 github.com/coreos/go-semver v0.3.1 - github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4 + github.com/cosi-project/runtime v0.3.0-alpha.7 github.com/docker/distribution v2.8.1+incompatible github.com/docker/docker v23.0.1+incompatible github.com/docker/go-connections v0.4.0 @@ -130,7 +130,7 @@ require ( golang.org/x/sys v0.5.0 golang.org/x/term v0.5.0 golang.org/x/time v0.3.0 - golang.zx2c4.com/wireguard/wgctrl v0.0.0-20221104135756-97bc4ad4a1cb + golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde google.golang.org/grpc v1.53.0 google.golang.org/protobuf v1.28.1 gopkg.in/yaml.v3 v3.0.1 diff --git a/go.sum b/go.sum index b96446a3e..09ffc5b60 100644 --- a/go.sum +++ b/go.sum @@ -260,8 +260,8 @@ github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPd github.com/asaskevich/govalidator v0.0.0-20190424111038-f61b66f89f4a/go.mod h1:lB+ZfQJz7igIIfQNfa7Ml4HSf2uFQQRzpGGRXenZAgY= github.com/aws/aws-sdk-go v1.15.11/go.mod h1:mFuSZ37Z9YOHbQEwBWztmVzqXrEkub65tZoCYDt7FT0= github.com/aws/aws-sdk-go v1.44.122/go.mod h1:y4AeaBuwd2Lk+GepC1E9v0qOiTws0MIWAX4oIKwKHZo= -github.com/aws/aws-sdk-go v1.44.201 h1:gKtyFyiVGh/uTW7sCQaoyU6XCUsnI8+WWKmbEaABCfw= -github.com/aws/aws-sdk-go v1.44.201/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.202 h1:nk/DtYoAS7zX4SbfiQEJO+C0GBN8ZxXrkD+BozwLvZk= +github.com/aws/aws-sdk-go v1.44.202/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/beevik/ntp v0.3.0 h1:xzVrPrE4ziasFXgBVBZJDP0Wg/KpMwk2KHJ4Ba8GrDw= github.com/beevik/ntp v0.3.0/go.mod h1:hIHWr+l3+/clUnF44zdK+CWW7fO8dR5cIylAQ76NRpg= github.com/benbjohnson/clock v1.1.0 h1:Q92kusRqC1XV2MjkWETPvjJVqKetz1OzxZB7mHJLju8= @@ -370,8 +370,8 @@ github.com/containerd/containerd v1.5.0-beta.4/go.mod h1:GmdgZd2zA2GYIBZ0w09Zvgq github.com/containerd/containerd v1.5.0-rc.0/go.mod h1:V/IXoMqNGgBlabz3tHD2TWDoTJseu1FGOKuoA4nNb2s= github.com/containerd/containerd v1.5.1/go.mod h1:0DOxVqwDy2iZvrZp2JUx/E+hS0UNTVn7dJnIOwtYR4g= github.com/containerd/containerd v1.5.7/go.mod h1:gyvv6+ugqY25TiXxcZC3L5yOeYgEw0QMhscqVp1AR9c= -github.com/containerd/containerd v1.6.17 h1:XDnJIeJW0cLf6v7/+N+6L9kGrChHeXekZp2VHu6OpiY= -github.com/containerd/containerd v1.6.17/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= +github.com/containerd/containerd v1.6.18 h1:qZbsLvmyu+Vlty0/Ex5xc0z2YtKpIsb5n45mAMI+2Ns= +github.com/containerd/containerd v1.6.18/go.mod h1:1RdCUu95+gc2v9t3IL+zIlpClSmew7/0YS8O5eQZrOw= github.com/containerd/continuity v0.0.0-20190426062206-aaeac12a7ffc/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20190815185530-f2a389ac0a02/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= github.com/containerd/continuity v0.0.0-20191127005431-f65d91d395eb/go.mod h1:GL3xCUCBDV3CZiTSEKksMWbLE66hEyuu9qyDOOqM47Y= @@ -455,8 +455,8 @@ github.com/coreos/go-systemd/v22 v22.5.0 h1:RrqgGjYQKalulkV8NGVIfkXQf6YYmOyiJKk8 github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4 h1:hrwax0fYagtHoQTZSalAoKxhYp10h4+y9muH2BxJy/8= -github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4/go.mod h1:pKny4SfaG5BBJ1x4aIWc5OyN90oXMhcbrNdC3wgdoYg= +github.com/cosi-project/runtime v0.3.0-alpha.7 h1:Zzvv9Y8lfjRKQz5rvn4Jq98Sb+d45ymPMisqORwrau0= +github.com/cosi-project/runtime v0.3.0-alpha.7/go.mod h1:pKny4SfaG5BBJ1x4aIWc5OyN90oXMhcbrNdC3wgdoYg= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w= @@ -1779,8 +1779,8 @@ golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224 h1:Ug9qvr1myri/zFN6xL golang.zx2c4.com/wintun v0.0.0-20211104114900-415007cec224/go.mod h1:deeaetjYA+DHMHg+sMSMI58GrEteJUUzzw7en6TJQcI= golang.zx2c4.com/wireguard v0.0.0-20220920152132-bb719d3a6e2c h1:Okh6a1xpnJslG9Mn84pId1Mn+Q8cvpo4HCeeFWHo0cA= golang.zx2c4.com/wireguard v0.0.0-20220920152132-bb719d3a6e2c/go.mod h1:enML0deDxY1ux+B6ANGiwtg0yAJi1rctkTpcHNAVPyg= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20221104135756-97bc4ad4a1cb h1:9aqVcYEDHmSNb0uOWukxV5lHV09WqiSiCuhEgWNETLY= -golang.zx2c4.com/wireguard/wgctrl v0.0.0-20221104135756-97bc4ad4a1cb/go.mod h1:mQqgjkW8GQQcJQsbBvK890TKqUK1DfKWkuBGbOkuMHQ= +golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde h1:ybF7AMzIUikL9x4LgwEmzhXtzRpKNqngme1VGDWz+Nk= +golang.zx2c4.com/wireguard/wgctrl v0.0.0-20230215201556-9c5414ab4bde/go.mod h1:mQqgjkW8GQQcJQsbBvK890TKqUK1DfKWkuBGbOkuMHQ= google.golang.org/api v0.0.0-20160322025152-9bf6e6e569ff/go.mod h1:4mhQ8q/RsB7i+udVvVy5NUi08OU8ZlA0gRVgrF7VFY0= google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE= google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M= diff --git a/hack/cloud-image-uploader/go.mod b/hack/cloud-image-uploader/go.mod index b0102b19e..a40d1f7f6 100644 --- a/hack/cloud-image-uploader/go.mod +++ b/hack/cloud-image-uploader/go.mod @@ -1,9 +1,9 @@ module github.com/siderolabs/cloud-image-uploader -go 1.19 +go 1.20 require ( - github.com/aws/aws-sdk-go v1.44.201 + github.com/aws/aws-sdk-go v1.44.202 github.com/google/uuid v1.3.0 github.com/siderolabs/go-retry v0.3.2 github.com/spf13/pflag v1.0.5 diff --git a/hack/cloud-image-uploader/go.sum b/hack/cloud-image-uploader/go.sum index 31ba7236d..48a7a25fe 100644 --- a/hack/cloud-image-uploader/go.sum +++ b/hack/cloud-image-uploader/go.sum @@ -1,5 +1,5 @@ -github.com/aws/aws-sdk-go v1.44.201 h1:gKtyFyiVGh/uTW7sCQaoyU6XCUsnI8+WWKmbEaABCfw= -github.com/aws/aws-sdk-go v1.44.201/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= +github.com/aws/aws-sdk-go v1.44.202 h1:nk/DtYoAS7zX4SbfiQEJO+C0GBN8ZxXrkD+BozwLvZk= +github.com/aws/aws-sdk-go v1.44.202/go.mod h1:aVsgQcEevwlmQ7qHE9I3h+dtQgpqhFB+i8Phjh7fkwI= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/hack/docgen/go.mod b/hack/docgen/go.mod index d9571ef2c..1e7f76b73 100644 --- a/hack/docgen/go.mod +++ b/hack/docgen/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos-hack-docgen -go 1.19 +go 1.20 // 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 diff --git a/hack/gotagsrewrite/go.mod b/hack/gotagsrewrite/go.mod index 5ff0a275e..66c173d59 100644 --- a/hack/gotagsrewrite/go.mod +++ b/hack/gotagsrewrite/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/gotagsrewrite -go 1.19 +go 1.20 require ( github.com/fatih/structtag v1.2.0 diff --git a/hack/release.toml b/hack/release.toml index f1022f6b1..003a4aeb9 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -18,13 +18,13 @@ preface = """\ [notes.updates] title = "Component Updates" description="""\ -* Linux: 6.1.8 -* containerd: v1.6.16 +* Linux: 6.1.12 +* containerd: v1.6.18 * Kubernetes: v1.26.1 * etcd: v3.5.7 * CoreDNS: v1.10.1 -Talos is built with Go 1.19.5. +Talos is built with Go 1.20.1. """ [notes.kernel-modules] diff --git a/hack/structprotogen/go.mod b/hack/structprotogen/go.mod index f9f6b9196..33a015667 100644 --- a/hack/structprotogen/go.mod +++ b/hack/structprotogen/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/structprotogen -go 1.19 +go 1.20 require ( github.com/fatih/structtag v1.2.0 diff --git a/package.json b/package.json index 960eee9bf..0e1e2d39f 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,6 @@ "devDependencies": { "autoprefixer": "^10.4.0", "postcss": "^8.3.7", - "postcss-cli": "^9.0.2" + "postcss-cli": "^10.0.0" } } diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index af85bbb81..df59eaee0 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -13,7 +13,7 @@ import ( const ( // DefaultKernelVersion is the default Linux kernel version. - DefaultKernelVersion = "6.1.8-talos" + DefaultKernelVersion = "6.1.12-talos" // DefaultKernelModulesPath is the default path to the kernel modules. DefaultKernelModulesPath = "/lib/modules" + "/" + DefaultKernelVersion @@ -429,7 +429,7 @@ const ( TrustdUserID = 51 // DefaultContainerdVersion is the default container runtime version. - DefaultContainerdVersion = "1.6.16" + DefaultContainerdVersion = "1.6.18" // SystemContainerdNamespace is the Containerd namespace for Talos services. SystemContainerdNamespace = "system" @@ -740,7 +740,7 @@ const ( DBusClientSocketPath = "/run/dbus/system_bus_socket" // GoVersion is the version of Go compiler this release was built with. - GoVersion = "go1.19.5" + GoVersion = "go1.20.1" // KubernetesTalosAPIServiceName is the name of the Kubernetes service to access Talos API. KubernetesTalosAPIServiceName = "talos" diff --git a/pkg/machinery/gendata/data/extras b/pkg/machinery/gendata/data/extras index b3d27491c..90b409912 100644 --- a/pkg/machinery/gendata/data/extras +++ b/pkg/machinery/gendata/data/extras @@ -1 +1 @@ -v1.4.0-alpha.0-2-g8cb4792 \ No newline at end of file +v1.4.0-alpha.0-5-g8b28b6b \ No newline at end of file diff --git a/pkg/machinery/gendata/data/pkgs b/pkg/machinery/gendata/data/pkgs index c284653fb..3f37c35c3 100644 --- a/pkg/machinery/gendata/data/pkgs +++ b/pkg/machinery/gendata/data/pkgs @@ -1 +1 @@ -v1.4.0-alpha.0-21-g1fae0b2 \ No newline at end of file +v1.4.0-alpha.0-26-g185f482 \ No newline at end of file diff --git a/pkg/machinery/go.mod b/pkg/machinery/go.mod index c90bae8a1..ea4acc416 100644 --- a/pkg/machinery/go.mod +++ b/pkg/machinery/go.mod @@ -1,6 +1,6 @@ module github.com/siderolabs/talos/pkg/machinery -go 1.19 +go 1.20 // 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 @@ -8,7 +8,7 @@ replace gopkg.in/yaml.v3 => github.com/unix4ever/yaml v0.0.0-20220527175918-f17b require ( github.com/containerd/go-cni v1.1.8 - github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4 + github.com/cosi-project/runtime v0.3.0-alpha.7 github.com/dustin/go-humanize v1.0.1 github.com/evanphx/json-patch v5.6.0+incompatible github.com/ghodss/yaml v1.0.0 diff --git a/pkg/machinery/go.sum b/pkg/machinery/go.sum index ed646b3ff..1baddf21b 100644 --- a/pkg/machinery/go.sum +++ b/pkg/machinery/go.sum @@ -20,8 +20,8 @@ github.com/containerd/go-cni v1.1.8 h1:/tPhnTpTmu/LPywPEMVqn2nJCZ7VEsuMFwcFLPdF4 github.com/containerd/go-cni v1.1.8/go.mod h1:fTJBazSSt2KF+XqfQArQICbF/cuHa1w1BYrHKPNkzZU= github.com/containernetworking/cni v1.1.2 h1:wtRGZVv7olUHMOqouPpn3cXJWpJgM6+EUl31EQbXALQ= github.com/containernetworking/cni v1.1.2/go.mod h1:sDpYKmGVENF3s6uvMvGgldDWeG8dMxakj/u+i9ht9vw= -github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4 h1:hrwax0fYagtHoQTZSalAoKxhYp10h4+y9muH2BxJy/8= -github.com/cosi-project/runtime v0.3.0-alpha.5.0.20230214191708-e6466f3cfde4/go.mod h1:pKny4SfaG5BBJ1x4aIWc5OyN90oXMhcbrNdC3wgdoYg= +github.com/cosi-project/runtime v0.3.0-alpha.7 h1:Zzvv9Y8lfjRKQz5rvn4Jq98Sb+d45ymPMisqORwrau0= +github.com/cosi-project/runtime v0.3.0-alpha.7/go.mod h1:pKny4SfaG5BBJ1x4aIWc5OyN90oXMhcbrNdC3wgdoYg= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= diff --git a/pkg/startup/rand.go b/pkg/startup/rand.go index 64bc4e9fe..10c21be55 100644 --- a/pkg/startup/rand.go +++ b/pkg/startup/rand.go @@ -18,6 +18,7 @@ func RandSeed() error { return fmt.Errorf("error seeding rand: %w", err) } + // nolint:staticcheck rand.Seed(int64(binary.LittleEndian.Uint64(seed))) return nil diff --git a/website/content/v1.0/introduction/getting-started.md b/website/content/v1.0/introduction/getting-started.md index 88e87643b..328f22da1 100644 --- a/website/content/v1.0/introduction/getting-started.md +++ b/website/content/v1.0/introduction/getting-started.md @@ -352,7 +352,7 @@ We would set those in the `talosconfig` with: The node is the target node on which you wish to perform the API call. -Keep in mind, when specifying nodes, their IPs and/or hostnames are *as seen by the endpoint servers*, not as from the client. +Keep in mind, when specifying nodes, their IPs and/or hostnames are _as seen by the endpoint servers_, not as from the client. This is because all connections are proxied through the endpoints. Some people also like to set a default set of nodes in the `talosconfig`. diff --git a/website/content/v1.0/talos-guides/upgrading-talos.md b/website/content/v1.0/talos-guides/upgrading-talos.md index df34aeaa3..b60c0e072 100644 --- a/website/content/v1.0/talos-guides/upgrading-talos.md +++ b/website/content/v1.0/talos-guides/upgrading-talos.md @@ -108,7 +108,7 @@ If `preserve` is not enabled, Talos will leave etcd membership. Once all the processes are stopped and the services are shut down, the filesystems will be unmounted. This allows Talos to produce a very clean upgrade, as close as possible to a pristine system. We verify the disk and then perform the actual image upgrade. -We set the bootloader to boot _once_ with the new kernel and OS image, then we reboot. +We set the bootloader to boot *once* with the new kernel and OS image, then we reboot. After the node comes back up and Talos verifies itself, it will make the bootloader change permanent, rejoin the cluster, and finally uncordon itself to receive new workloads. diff --git a/website/content/v1.1/introduction/getting-started.md b/website/content/v1.1/introduction/getting-started.md index 88e87643b..328f22da1 100644 --- a/website/content/v1.1/introduction/getting-started.md +++ b/website/content/v1.1/introduction/getting-started.md @@ -352,7 +352,7 @@ We would set those in the `talosconfig` with: The node is the target node on which you wish to perform the API call. -Keep in mind, when specifying nodes, their IPs and/or hostnames are *as seen by the endpoint servers*, not as from the client. +Keep in mind, when specifying nodes, their IPs and/or hostnames are _as seen by the endpoint servers_, not as from the client. This is because all connections are proxied through the endpoints. Some people also like to set a default set of nodes in the `talosconfig`. diff --git a/website/content/v1.1/talos-guides/upgrading-talos.md b/website/content/v1.1/talos-guides/upgrading-talos.md index d42a6fabe..590d51044 100644 --- a/website/content/v1.1/talos-guides/upgrading-talos.md +++ b/website/content/v1.1/talos-guides/upgrading-talos.md @@ -122,7 +122,7 @@ If `preserve` is not enabled, Talos will leave etcd membership. Once all the processes are stopped and the services are shut down, the filesystems will be unmounted. This allows Talos to produce a very clean upgrade, as close as possible to a pristine system. We verify the disk and then perform the actual image upgrade. -We set the bootloader to boot _once_ with the new kernel and OS image, then we reboot. +We set the bootloader to boot *once* with the new kernel and OS image, then we reboot. After the node comes back up and Talos verifies itself, it will make the bootloader change permanent, rejoin the cluster, and finally uncordon itself to receive new workloads. diff --git a/website/content/v1.2/introduction/getting-started.md b/website/content/v1.2/introduction/getting-started.md index 2ad284304..e08ea96dc 100644 --- a/website/content/v1.2/introduction/getting-started.md +++ b/website/content/v1.2/introduction/getting-started.md @@ -356,7 +356,7 @@ We would set those in the `talosconfig` with: The node is the target you wish to perform the API call on. -> When specifying nodes, their IPs and/or hostnames are *as seen by the endpoint servers*, not as from the client. +> When specifying nodes, their IPs and/or hostnames are _as seen by the endpoint servers_, not as from the client. > This is because all connections are proxied through the endpoints. You may provide `-n` or `--nodes` to any `talosctl` command to supply the node or (comma-separated) nodes on which you wish to perform the operation. @@ -367,7 +367,7 @@ For example, to see the containers running on node 192.168.0.200: talosctl -n 192.168.0.200 containers ``` -To see the etcd logs on *both* nodes 192.168.0.10 and 192.168.0.11: +To see the etcd logs on _both_ nodes 192.168.0.10 and 192.168.0.11: ```bash talosctl -n 192.168.0.10,192.168.0.11 logs etcd diff --git a/website/content/v1.2/talos-guides/upgrading-talos.md b/website/content/v1.2/talos-guides/upgrading-talos.md index efcacde3f..bfab49e76 100644 --- a/website/content/v1.2/talos-guides/upgrading-talos.md +++ b/website/content/v1.2/talos-guides/upgrading-talos.md @@ -123,7 +123,7 @@ If `preserve` is not enabled, Talos will leave etcd membership. Once all the processes are stopped and the services are shut down, the filesystems will be unmounted. This allows Talos to produce a very clean upgrade, as close as possible to a pristine system. We verify the disk and then perform the actual image upgrade. -We set the bootloader to boot _once_ with the new kernel and OS image, then we reboot. +We set the bootloader to boot *once* with the new kernel and OS image, then we reboot. After the node comes back up and Talos verifies itself, it will make the bootloader change permanent, rejoin the cluster, and finally uncordon itself to receive new workloads. diff --git a/website/content/v1.3/introduction/getting-started.md b/website/content/v1.3/introduction/getting-started.md index e717e39ec..be6c4b76e 100644 --- a/website/content/v1.3/introduction/getting-started.md +++ b/website/content/v1.3/introduction/getting-started.md @@ -383,7 +383,7 @@ We would set those in the `talosconfig` with: The node is the target you wish to perform the API call on. -> When specifying nodes, their IPs and/or hostnames are *as seen by the endpoint servers*, not as from the client. +> When specifying nodes, their IPs and/or hostnames are _as seen by the endpoint servers_, not as from the client. > This is because all connections are proxied through the endpoints. You may provide `-n` or `--nodes` to any `talosctl` command to supply the node or (comma-separated) nodes on which you wish to perform the operation. @@ -394,7 +394,7 @@ For example, to see the containers running on node 192.168.0.200: talosctl -n 192.168.0.200 containers ``` -To see the etcd logs on *both* nodes 192.168.0.10 and 192.168.0.11: +To see the etcd logs on _both_ nodes 192.168.0.10 and 192.168.0.11: ```bash talosctl -n 192.168.0.10,192.168.0.11 logs etcd diff --git a/website/content/v1.3/talos-guides/upgrading-talos.md b/website/content/v1.3/talos-guides/upgrading-talos.md index 0086c9d08..8329b914b 100644 --- a/website/content/v1.3/talos-guides/upgrading-talos.md +++ b/website/content/v1.3/talos-guides/upgrading-talos.md @@ -135,7 +135,7 @@ If `preserve` is not enabled, Talos will leave etcd membership. Once all the processes are stopped and the services are shut down, the filesystems will be unmounted. This allows Talos to produce a very clean upgrade, as close as possible to a pristine system. We verify the disk and then perform the actual image upgrade. -We set the bootloader to boot _once_ with the new kernel and OS image, then we reboot. +We set the bootloader to boot *once* with the new kernel and OS image, then we reboot. After the node comes back up and Talos verifies itself, it will make the bootloader change permanent, rejoin the cluster, and finally uncordon itself to receive new workloads. diff --git a/website/content/v1.4/introduction/getting-started.md b/website/content/v1.4/introduction/getting-started.md index e717e39ec..be6c4b76e 100644 --- a/website/content/v1.4/introduction/getting-started.md +++ b/website/content/v1.4/introduction/getting-started.md @@ -383,7 +383,7 @@ We would set those in the `talosconfig` with: The node is the target you wish to perform the API call on. -> When specifying nodes, their IPs and/or hostnames are *as seen by the endpoint servers*, not as from the client. +> When specifying nodes, their IPs and/or hostnames are _as seen by the endpoint servers_, not as from the client. > This is because all connections are proxied through the endpoints. You may provide `-n` or `--nodes` to any `talosctl` command to supply the node or (comma-separated) nodes on which you wish to perform the operation. @@ -394,7 +394,7 @@ For example, to see the containers running on node 192.168.0.200: talosctl -n 192.168.0.200 containers ``` -To see the etcd logs on *both* nodes 192.168.0.10 and 192.168.0.11: +To see the etcd logs on _both_ nodes 192.168.0.10 and 192.168.0.11: ```bash talosctl -n 192.168.0.10,192.168.0.11 logs etcd diff --git a/website/content/v1.4/talos-guides/upgrading-talos.md b/website/content/v1.4/talos-guides/upgrading-talos.md index d46fb9817..6ce466229 100644 --- a/website/content/v1.4/talos-guides/upgrading-talos.md +++ b/website/content/v1.4/talos-guides/upgrading-talos.md @@ -112,7 +112,7 @@ If `preserve` is not enabled, Talos will leave etcd membership. Once all the processes are stopped and the services are shut down, the filesystems will be unmounted. This allows Talos to produce a very clean upgrade, as close as possible to a pristine system. We verify the disk and then perform the actual image upgrade. -We set the bootloader to boot _once_ with the new kernel and OS image, then we reboot. +We set the bootloader to boot *once* with the new kernel and OS image, then we reboot. After the node comes back up and Talos verifies itself, it will make the bootloader change permanent, rejoin the cluster, and finally uncordon itself to receive new workloads.