From 5453e7738e87b9aac766df755eb832c974a5e949 Mon Sep 17 00:00:00 2001 From: swamyan Date: Fri, 15 Sep 2023 11:07:05 +0530 Subject: [PATCH] [release-1.7] Bump to Go 1.20.8 --- Dockerfile | 2 +- Makefile | 2 +- go.mod | 2 +- go.sum | 4 ++-- hack/ensure-go.sh | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index a994d83ed5..0a04da5474 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # limitations under the License. # Build the manager binary -ARG GOLANG_VERSION=golang:1.19.13 +ARG GOLANG_VERSION=golang:1.20.8 FROM --platform=${BUILDPLATFORM} ${GOLANG_VERSION} as builder WORKDIR /workspace diff --git a/Makefile b/Makefile index c3c7dfe2c9..7b6807224f 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/go.mod b/go.mod index a622767ad7..50fe1fcfcb 100644 --- a/go.mod +++ b/go.mod @@ -17,7 +17,7 @@ require ( github.com/vmware-tanzu/vm-operator/api v0.0.0-20221204041501-ec03d8bb733c github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20211209213435-0f4ab286f64f github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20211209213435-0f4ab286f64f - github.com/vmware/govmomi v0.30.4 + github.com/vmware/govmomi v0.30.7 golang.org/x/crypto v0.11.0 golang.org/x/exp v0.0.0-20221002003631-540bb7301a08 golang.org/x/mod v0.10.0 diff --git a/go.sum b/go.sum index 57a70608b1..d4c2a8df38 100644 --- a/go.sum +++ b/go.sum @@ -624,8 +624,8 @@ github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20211209213435-0f4ab286f github.com/vmware-tanzu/vm-operator/external/ncp v0.0.0-20211209213435-0f4ab286f64f/go.mod h1:5rqRJ9zGR+KnKbkGx373WgN8xJpvAj99kHnfoDYRO5I= github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20211209213435-0f4ab286f64f h1:wwYUf16/g8bLywQMQJB5VHbDtuf6aOFH24Ar2/yA7+I= github.com/vmware-tanzu/vm-operator/external/tanzu-topology v0.0.0-20211209213435-0f4ab286f64f/go.mod h1:dfYrWS8DMRN+XZfhu8M4LVHmeGvYB29Ipd7j4uIq+mU= -github.com/vmware/govmomi v0.30.4 h1:BCKLoTmiBYRuplv3GxKEMBLtBaJm8PA56vo9bddIpYQ= -github.com/vmware/govmomi v0.30.4/go.mod h1:F7adsVewLNHsW/IIm7ziFURaXDaHEwcc+ym4r3INMdY= +github.com/vmware/govmomi v0.30.7 h1:YO8CcDpLJzmq6PK5/CBQbXyV21iCMh8SbdXt+xNkXp8= +github.com/vmware/govmomi v0.30.7/go.mod h1:epgoslm97rLECMV4D+08ORzUBEU7boFSepKjt7AYVGg= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415/go.mod h1:GwrjFmJcFw6At/Gs6z4yjiIwzuJ1/+UwLxMQDVQXShQ= github.com/xeipuuv/gojsonschema v1.2.0/go.mod h1:anYRn/JVcOK2ZgGU+IjEV4nwlhoK5sQluxsYJ78Id3Y= diff --git a/hack/ensure-go.sh b/hack/ensure-go.sh index 37cad486c6..a09074f173 100755 --- a/hack/ensure-go.sh +++ b/hack/ensure-go.sh @@ -19,7 +19,7 @@ set -o nounset set -o pipefail # MIN_GO_VERSION is the minimum, supported Go version. -MIN_GO_VERSION="go${MIN_GO_VERSION:-1.19.13}" +MIN_GO_VERSION="go${MIN_GO_VERSION:-1.20}" # Ensure the go tool exists and is a viable version. verify_go_version() {