diff --git a/Dockerfile b/Dockerfile index 0e8a89c4f96..6417d3c00a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # builder -FROM golang:1.20.7 AS builder +FROM golang:1.21.0 AS builder WORKDIR /go/src/github.com/gardener/gardener COPY . . ARG EFFECTIVE_VERSION diff --git a/hack/tools.mk b/hack/tools.mk index ca393b8463c..26c49489fc1 100644 --- a/hack/tools.mk +++ b/hack/tools.mk @@ -59,7 +59,7 @@ YQ := $(TOOLS_BIN_DIR)/yq # default tool versions DOCFORGE_VERSION ?= v0.33.0 -GOLANGCI_LINT_VERSION ?= v1.53.1 +GOLANGCI_LINT_VERSION ?= v1.54.1 GO_APIDIFF_VERSION ?= v0.5.0 GO_ADD_LICENSE_VERSION ?= v1.1.1 GOIMPORTSREVISER_VERSION ?= v3.3.1 diff --git a/hack/tools/gomegacheck/go.mod b/hack/tools/gomegacheck/go.mod index 50db36a2cce..659327225d2 100644 --- a/hack/tools/gomegacheck/go.mod +++ b/hack/tools/gomegacheck/go.mod @@ -6,9 +6,9 @@ go 1.20 // only needed to build the gomegacheck tool // this has to be kept in sync with the used golangci-lint version // use go version -m hack/tools/bin/golangci-lint to detect the dependency versions -require golang.org/x/tools v0.9.2 +require golang.org/x/tools v0.12.0 require ( - golang.org/x/mod v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.11.0 // indirect ) diff --git a/hack/tools/gomegacheck/go.sum b/hack/tools/gomegacheck/go.sum index 9be83f699a9..14a66101bcb 100644 --- a/hack/tools/gomegacheck/go.sum +++ b/hack/tools/gomegacheck/go.sum @@ -1,7 +1,7 @@ -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= -golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM= diff --git a/hack/tools/logcheck/go.mod b/hack/tools/logcheck/go.mod index d8482e89d90..86d3cc52898 100644 --- a/hack/tools/logcheck/go.mod +++ b/hack/tools/logcheck/go.mod @@ -5,13 +5,13 @@ go 1.20 // This is a separate go module to decouple the gardener codebase and production binaries from dependencies that are // only needed to build the logcheck tool require ( - golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e + golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea // this has to be kept in sync with the used golangci-lint version // use go version -m hack/tools/bin/golangci-lint to detect the dependency versions - golang.org/x/tools v0.9.2 + golang.org/x/tools v0.12.0 ) require ( - golang.org/x/mod v0.10.0 // indirect - golang.org/x/sys v0.8.0 // indirect + golang.org/x/mod v0.12.0 // indirect + golang.org/x/sys v0.11.0 // indirect ) diff --git a/hack/tools/logcheck/go.sum b/hack/tools/logcheck/go.sum index 465be50fe24..e2018336958 100644 --- a/hack/tools/logcheck/go.sum +++ b/hack/tools/logcheck/go.sum @@ -1,9 +1,9 @@ -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= -golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/mod v0.10.0 h1:lFO9qtOdlre5W1jxS3r/4szv2/6iXxScdzjoBMXNhYk= -golang.org/x/mod v0.10.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= -golang.org/x/sync v0.2.0 h1:PUR+T4wwASmuSTYdKjYHI5TD22Wy5ogLU5qZCOLxBrI= -golang.org/x/sys v0.8.0 h1:EBmGv8NaZBZTWvrbjNoL6HVt+IVy3QDQpJs7VRIw3tU= -golang.org/x/sys v0.8.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/tools v0.9.2 h1:UXbndbirwCAx6TULftIfie/ygDNCwxEie+IiNP1IcNc= -golang.org/x/tools v0.9.2/go.mod h1:owI94Op576fPu3cIGQeHs3joujW/2Oc6MtlxbF5dfNc= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea h1:vLCWI/yYrdEHyN2JzIzPO3aaQJHQdp89IZBA/+azVC4= +golang.org/x/exp v0.0.0-20230510235704-dd950f8aeaea/go.mod h1:V1LtkGg67GoY2N1AnLN78QLrzxkLyJw7RJb1gzOOz9w= +golang.org/x/mod v0.12.0 h1:rmsUpXtvNzj340zd98LZ4KntptpfRHwpFOHG188oHXc= +golang.org/x/mod v0.12.0/go.mod h1:iBbtSCu2XBx23ZKBPSOrRkjjQPZFPuis4dIYUhu/chs= +golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= +golang.org/x/sys v0.11.0 h1:eG7RXZHdqOJ1i+0lgLgCpSXAp6M3LYlAo6osgSi0xOM= +golang.org/x/sys v0.11.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/tools v0.12.0 h1:YW6HUoUmYBpwSgyaGaZq1fHjrBjX1rlpZ54T6mu2kss= +golang.org/x/tools v0.12.0/go.mod h1:Sc0INKfu04TlqNoRA1hgpFZbhYXHPr4V5DzpSBTPqQM=