From 1d694bd3d3d0df483d6e6222bd5c30f07ff0cfc3 Mon Sep 17 00:00:00 2001 From: Feruzjon Muyassarov Date: Fri, 19 Feb 2021 11:06:24 +0200 Subject: [PATCH] Bump the Golang version to 1.16 Bump the Golang version to 1.16 --- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- hack/Dockerfile.unit | 2 +- hack/codegen.sh | 2 +- hack/ensure-go.sh | 2 +- hack/gofmt.sh | 2 +- hack/govet.sh | 2 +- hack/tools/go.mod | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index db19aae23..f92967d6a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -13,7 +13,7 @@ # limitations under the License. # Build the manager binary on golang image -FROM registry.hub.docker.com/library/golang:1.15.3 as builder +FROM registry.hub.docker.com/library/golang:1.16 as builder WORKDIR /workspace # Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy diff --git a/Makefile b/Makefile index 2e51b4e9a..1fdc89a79 100644 --- a/Makefile +++ b/Makefile @@ -319,7 +319,7 @@ release-binary: $(RELEASE_DIR) -e GOARCH=$(GOARCH) \ -v "$$(pwd):/workspace" \ -w /workspace \ - golang:1.15.3 \ + golang:1.16 \ go build -a -ldflags '-extldflags "-static"' \ -o $(RELEASE_DIR)/$(notdir $(RELEASE_BINARY))-$(GOOS)-$(GOARCH) $(RELEASE_BINARY) diff --git a/go.mod b/go.mod index 925df7499..cd4a50f5e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/metal3-io/ip-address-manager -go 1.15 +go 1.16 require ( cloud.google.com/go v0.75.0 // indirect diff --git a/hack/Dockerfile.unit b/hack/Dockerfile.unit index b3d3ba452..638a202e7 100644 --- a/hack/Dockerfile.unit +++ b/hack/Dockerfile.unit @@ -1,4 +1,4 @@ -FROM registry.hub.docker.com/library/golang:1.15.3 +FROM registry.hub.docker.com/library/golang:1.16 WORKDIR /usr/local/kubebuilder COPY /hack/tools /usr/local/kubebuilder/ diff --git a/hack/codegen.sh b/hack/codegen.sh index 8d565e4b1..afb4b7563 100755 --- a/hack/codegen.sh +++ b/hack/codegen.sh @@ -34,6 +34,6 @@ else --volume "${PWD}:/data:rw,z" \ --entrypoint sh \ --workdir /data \ - registry.hub.docker.com/library/golang:1.15.3 \ + registry.hub.docker.com/library/golang:1.16 \ /data/hack/codegen.sh fi; \ No newline at end of file diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 64ff752f3..a26a9f1e0 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -31,7 +31,7 @@ EOF local go_version IFS=" " read -ra go_version <<< "$(go version)" local minimum_go_version - minimum_go_version=go1.15.0 + minimum_go_version=go1.15.3 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 <