From 6b7d2b2680354340433606462f208ac934963939 Mon Sep 17 00:00:00 2001 From: cahillsf Date: Thu, 14 Sep 2023 09:04:48 -0400 Subject: [PATCH] bump release 1.4 to go 1.20.8 bump min go to 1.20 add no-lint for SA1019 (rand.Seed deprecation in go 1.20) --- Makefile | 2 +- Tiltfile | 2 +- bootstrap/kubeadm/main.go | 1 + controlplane/kubeadm/main.go | 1 + hack/ensure-go.sh | 2 +- main.go | 1 + test/infrastructure/docker/main.go | 1 + 7 files changed, 7 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 33b3f6c35add..4e33e067f102 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ SHELL:=/usr/bin/env bash # # Go. # -GO_VERSION ?= 1.19.13 +GO_VERSION ?= 1.20.8 GO_CONTAINER_IMAGE ?= docker.io/library/golang:$(GO_VERSION) # Use GOPROXY environment variable if set diff --git a/Tiltfile b/Tiltfile index 0a3488060c57..204f72e36527 100644 --- a/Tiltfile +++ b/Tiltfile @@ -165,7 +165,7 @@ def load_provider_tiltfiles(): tilt_helper_dockerfile_header = """ # Tilt image -FROM golang:1.19.13 as tilt-helper +FROM golang:1.20.8 as tilt-helper # Support live reloading with Tilt RUN go install github.com/go-delve/delve/cmd/dlv@v1.9.1 RUN wget --output-document /restart.sh --quiet https://raw.githubusercontent.com/tilt-dev/rerun-process-wrapper/master/restart.sh && \ diff --git a/bootstrap/kubeadm/main.go b/bootstrap/kubeadm/main.go index 4b451df0f5cd..b10d6af60e5d 100644 --- a/bootstrap/kubeadm/main.go +++ b/bootstrap/kubeadm/main.go @@ -145,6 +145,7 @@ func InitFlags(fs *pflag.FlagSet) { } func main() { + //nolint:staticcheck rand.Seed(time.Now().UnixNano()) InitFlags(pflag.CommandLine) diff --git a/controlplane/kubeadm/main.go b/controlplane/kubeadm/main.go index 107d9050c3ab..fe3ac49e4bbd 100644 --- a/controlplane/kubeadm/main.go +++ b/controlplane/kubeadm/main.go @@ -153,6 +153,7 @@ func InitFlags(fs *pflag.FlagSet) { feature.MutableGates.AddFlag(fs) } func main() { + //nolint:staticcheck rand.Seed(time.Now().UnixNano()) InitFlags(pflag.CommandLine) diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 3c84f2568116..d19b6cd596c5 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -38,7 +38,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.19 + minimum_go_version=go1.20 if [[ "${minimum_go_version}" != $(echo -e "${minimum_go_version}\n${go_version[2]}" | sort -s -t. -k 1,1 -k 2,2n -k 3,3n | head -n1) && "${go_version[2]}" != "devel" ]]; then cat <