From da2edb9de067fc21c792e948903bc2c880b2c2d1 Mon Sep 17 00:00:00 2001 From: Andrey Smirnov Date: Wed, 15 Feb 2023 17:20:31 +0400 Subject: [PATCH] chore: bump dependencies CoreDNS: v1.10.1 And many other small bumps. Signed-off-by: Andrey Smirnov --- .golangci.yml | 9 +++++++++ Dockerfile | 2 +- Makefile | 10 +++++----- hack/docgen/go.mod | 4 ++-- hack/docgen/go.sum | 8 ++++---- hack/release.toml | 1 + hack/structprotogen/go.mod | 6 +++--- hack/structprotogen/go.sum | 12 ++++++------ pkg/machinery/constants/constants.go | 2 +- website/content/v1.4/reference/configuration.md | 4 ++-- 10 files changed, 34 insertions(+), 24 deletions(-) diff --git a/.golangci.yml b/.golangci.yml index c5337b689..70d1aef7d 100644 --- a/.golangci.yml +++ b/.golangci.yml @@ -168,12 +168,16 @@ linters: - wrapcheck - contextcheck # enable once golangci-lint 1.50.1 or 1.51 lands - dupword # too annoying + - musttag # too annoying # abandoned linters for which golangci shows the warning that the repo is archived by the owner - golint - interfacer - maligned - scopelint + - varcheck + - structcheck + - deadcode disable-all: false fast: false @@ -435,6 +439,11 @@ issues: linters: - dupl # some interfaces and implementation are nearly identical (e.g. APIServer, ControllerManager, and Scheduler) + # unused going into opencontainers repo (?) + - path: specs-go/config.go + linters: + - unused + # Independently from option `exclude` we use default exclude patterns, # it can be disabled by this option. To list all # excluded by default patterns execute `golangci-lint run --help`. diff --git a/Dockerfile b/Dockerfile index cce8460cf..97924006c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -95,7 +95,7 @@ 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"] ARG GOLANGCILINT_VERSION -RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCILINT_VERSION} \ +RUN --mount=type=cache,target=/.cache go install github.com/golangci/golangci-lint/cmd/golangci-lint@${GOLANGCILINT_VERSION} \ && mv /go/bin/golangci-lint /toolchain/go/bin/golangci-lint ARG GOIMPORTS_VERSION RUN --mount=type=cache,target=/.cache go install golang.org/x/tools/cmd/goimports@${GOIMPORTS_VERSION} \ diff --git a/Makefile b/Makefile index 70e2d03b7..a502df3e8 100644 --- a/Makefile +++ b/Makefile @@ -19,13 +19,13 @@ EXTRAS ?= v1.4.0-alpha.0-2-g8cb4792 # renovate: datasource=github-tags depName=golang/go GO_VERSION ?= 1.19 # renovate: datasource=go depName=golang.org/x/tools -GOIMPORTS_VERSION ?= v0.5.0 +GOIMPORTS_VERSION ?= v0.6.0 # renovate: datasource=go depName=mvdan.cc/gofumpt GOFUMPT_VERSION ?= v0.4.0 # renovate: datasource=go depName=github.com/golangci/golangci-lint -GOLANGCILINT_VERSION ?= v1.50.1 +GOLANGCILINT_VERSION ?= v1.51.1 # renovate: datasource=go depName=golang.org/x/tools -STRINGER_VERSION ?= v0.5.0 +STRINGER_VERSION ?= v0.6.0 # renovate: datasource=go depName=github.com/alvaroloes/enumer ENUMER_VERSION ?= v1.1.2 # renovate: datasource=go depName=k8s.io/code-generator @@ -44,9 +44,9 @@ KUBECTL_VERSION ?= v1.26.1 # renovate: datasource=github-releases depName=kastenhq/kubestr KUBESTR_VERSION ?= v0.4.36 # renovate: datasource=github-releases depName=helm/helm -HELM_VERSION ?= v3.11.0 +HELM_VERSION ?= v3.11.1 # renovate: datasource=github-releases depName=kubernetes-sigs/cluster-api -CLUSTERCTL_VERSION ?= 1.3.2 +CLUSTERCTL_VERSION ?= 1.3.3 KUBECTL_URL ?= https://storage.googleapis.com/kubernetes-release/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 diff --git a/hack/docgen/go.mod b/hack/docgen/go.mod index 49d937962..d9571ef2c 100644 --- a/hack/docgen/go.mod +++ b/hack/docgen/go.mod @@ -10,8 +10,8 @@ require ( github.com/gomarkdown/markdown v0.0.0-20221013030248-663e2500819c github.com/iancoleman/orderedmap v0.2.0 github.com/invopop/jsonschema v0.7.0 - github.com/microcosm-cc/bluemonday v1.0.21 - github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 + github.com/microcosm-cc/bluemonday v1.0.22 + github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 github.com/siderolabs/gen v0.4.3 gopkg.in/yaml.v3 v3.0.1 mvdan.cc/gofumpt v0.4.0 diff --git a/hack/docgen/go.sum b/hack/docgen/go.sum index 4aabe314c..ec465c096 100644 --- a/hack/docgen/go.sum +++ b/hack/docgen/go.sum @@ -16,13 +16,13 @@ github.com/invopop/jsonschema v0.7.0 h1:2vgQcBz1n256N+FpX3Jq7Y17AjYt46Ig3zIWyy77 github.com/invopop/jsonschema v0.7.0/go.mod h1:O9uiLokuu0+MGFlyiaqtWxwqJm41/+8Nj0lD7A36YH0= github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= -github.com/microcosm-cc/bluemonday v1.0.21 h1:dNH3e4PSyE4vNX+KlRGHT5KrSvjeUkoNPwEORjffHJg= -github.com/microcosm-cc/bluemonday v1.0.21/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= +github.com/microcosm-cc/bluemonday v1.0.22 h1:p2tT7RNzRdCi0qmwxG+HbqD6ILkmwter1ZwVZn1oTxA= +github.com/microcosm-cc/bluemonday v1.0.22/go.mod h1:ytNkv4RrDrLJ2pqlsSI46O6IVXmZOBBD4SaJyDwwTkM= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rogpeppe/go-internal v1.9.0 h1:73kH8U+JUqXU8lRuOHeVHaa/SZPifC7BkcraZVejAe8= -github.com/santhosh-tekuri/jsonschema/v5 v5.1.1 h1:lEOLY2vyGIqKWUI9nzsOJRV3mb3WC9dXYORsLEUcoeY= -github.com/santhosh-tekuri/jsonschema/v5 v5.1.1/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= +github.com/santhosh-tekuri/jsonschema/v5 v5.2.0 h1:WCcC4vZDS1tYNxjWlwRJZQy28r8CMoggKnxNzxsVDMQ= +github.com/santhosh-tekuri/jsonschema/v5 v5.2.0/go.mod h1:FKdcjfQW6rpZSnxxUvEA5H/cDPdvJ/SZJQLWWXWGrZ0= github.com/siderolabs/gen v0.4.3 h1:V3UsZ2KrsryaTMZGZUHAr1CFdPc2/R1lM6lA4a4zCDo= github.com/siderolabs/gen v0.4.3/go.mod h1:wS8tFq7sn5vqKAuyS30vJUig3tX5v6q79VG4KfUnILM= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= diff --git a/hack/release.toml b/hack/release.toml index 5dfb3b9a4..f1022f6b1 100644 --- a/hack/release.toml +++ b/hack/release.toml @@ -22,6 +22,7 @@ preface = """\ * containerd: v1.6.16 * Kubernetes: v1.26.1 * etcd: v3.5.7 +* CoreDNS: v1.10.1 Talos is built with Go 1.19.5. """ diff --git a/hack/structprotogen/go.mod b/hack/structprotogen/go.mod index 67c558eee..f9f6b9196 100644 --- a/hack/structprotogen/go.mod +++ b/hack/structprotogen/go.mod @@ -5,13 +5,13 @@ go 1.19 require ( github.com/fatih/structtag v1.2.0 github.com/spf13/cobra v1.6.1 - golang.org/x/tools v0.5.0 + golang.org/x/tools v0.6.0 gopkg.in/typ.v4 v4.2.0 ) require ( github.com/inconshreveable/mousetrap v1.0.1 // indirect github.com/spf13/pflag v1.0.5 // indirect - golang.org/x/mod v0.7.0 // indirect - golang.org/x/sys v0.4.0 // indirect + golang.org/x/mod v0.8.0 // indirect + golang.org/x/sys v0.5.0 // indirect ) diff --git a/hack/structprotogen/go.sum b/hack/structprotogen/go.sum index a510ec132..a2b394872 100644 --- a/hack/structprotogen/go.sum +++ b/hack/structprotogen/go.sum @@ -8,13 +8,13 @@ github.com/spf13/cobra v1.6.1 h1:o94oiPyS4KD1mPy2fmcYYHHfCxLqYjJOhGsCHFZtEzA= github.com/spf13/cobra v1.6.1/go.mod h1:IOw/AERYS7UzyrGinqmz6HLUo219MORXGxhbaJUqzrY= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg= -golang.org/x/mod v0.7.0 h1:LapD9S96VoQRhi/GrNTqeBJFrUjs5UHCAtTlgwA5oZA= -golang.org/x/mod v0.7.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/mod v0.8.0 h1:LUYupSeNrTNCGzR/hVBk2NHZO4hXcVaW1k4Qx7rjPx8= +golang.org/x/mod v0.8.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o= -golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18= -golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4= -golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k= +golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU= +golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/tools v0.6.0 h1:BOw41kyTf3PuCW1pVQf8+Cyg8pMlkYB1oo9iJ6D/lKM= +golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/typ.v4 v4.2.0 h1:rT3IApRQ7JZUIMpX6NjAIZ5UvoRjvyt083oy1lcS+kQ= gopkg.in/typ.v4 v4.2.0/go.mod h1:wolXe8DlewxRCjA7SOiT3zjrZ0eQJZcr8cmV6bQWJUM= diff --git a/pkg/machinery/constants/constants.go b/pkg/machinery/constants/constants.go index b2d9341f6..af85bbb81 100644 --- a/pkg/machinery/constants/constants.go +++ b/pkg/machinery/constants/constants.go @@ -326,7 +326,7 @@ const ( // DefaultCoreDNSVersion is the default version for the CoreDNS. // renovate: datasource=github-releases depName=coredns/coredns - DefaultCoreDNSVersion = "1.10.0" + DefaultCoreDNSVersion = "1.10.1" // LabelNodeRoleMaster is the node label required by a control plane node. LabelNodeRoleMaster = "node-role.kubernetes.io/master" diff --git a/website/content/v1.4/reference/configuration.md b/website/content/v1.4/reference/configuration.md index 7e8ae573c..096c1fb25 100644 --- a/website/content/v1.4/reference/configuration.md +++ b/website/content/v1.4/reference/configuration.md @@ -601,7 +601,7 @@ etcd: {{< /highlight >}} | | |`coreDNS` |CoreDNS |Core DNS specific configuration options.
Show example(s){{< highlight yaml >}} coreDNS: - image: docker.io/coredns/coredns:1.10.0 # The `image` field is an override to the default coredns image. + image: docker.io/coredns/coredns:1.10.1 # The `image` field is an override to the default coredns image. {{< /highlight >}}
| | |`externalCloudProvider` |ExternalCloudProviderConfig |External cloud provider configuration.
Show example(s){{< highlight yaml >}} externalCloudProvider: @@ -1289,7 +1289,7 @@ Appears in: {{< highlight yaml >}} -image: docker.io/coredns/coredns:1.10.0 # The `image` field is an override to the default coredns image. +image: docker.io/coredns/coredns:1.10.1 # The `image` field is an override to the default coredns image. {{< /highlight >}}