From 766290a7d61216608cd388af9505c3f819e711a4 Mon Sep 17 00:00:00 2001 From: ymo24 <102765549+ymo24@users.noreply.github.com> Date: Wed, 10 May 2023 15:58:21 -0700 Subject: [PATCH] [CAFV-246] upgrade go version to 1.19 (#440) * upgrade go version to 1.19 Signed-off-by: ymo24 * address minor fix Signed-off-by: ymo24 --------- Signed-off-by: ymo24 --- Dockerfile | 2 +- Dockerfile-ConversionGen | 2 +- Makefile | 4 ++-- go.mod | 2 +- go.sum | 4 ---- 5 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5ab2eafc0..8b29c0d5e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.17 as builder +FROM golang:1.19 as builder RUN apt-get update && \ apt-get -y install \ diff --git a/Dockerfile-ConversionGen b/Dockerfile-ConversionGen index 9862bdb65..ca5022bd4 100644 --- a/Dockerfile-ConversionGen +++ b/Dockerfile-ConversionGen @@ -1,4 +1,4 @@ -FROM golang:1.18 as builder +FROM golang:1.19 as builder ENV CONVERSION_GEN_VER=v0.23.1 ENV CONVERSION_GEN_BIN=conversion-gen diff --git a/Makefile b/Makefile index ac52608ff..36fefe2bc 100644 --- a/Makefile +++ b/Makefile @@ -89,8 +89,8 @@ vet: ## Run go vet against code. go vet ./... vendor: ## Run go mod vendor - go mod edit -go=1.17 - go mod tidy -compat=1.17 + go mod edit -go=1.19 + go mod tidy -compat=1.19 go mod vendor diff --git a/go.mod b/go.mod index 65dbf2cf9..c78de706e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/vmware/cluster-api-provider-cloud-director -go 1.17 +go 1.19 require ( github.com/Masterminds/sprig/v3 v3.2.2 diff --git a/go.sum b/go.sum index 0c41dba8c..20c3565c8 100644 --- a/go.sum +++ b/go.sum @@ -545,10 +545,6 @@ github.com/stretchr/testify v1.7.2/go.mod h1:R6va5+xMeoiuVRoj+gSkQ7d3FALtqAAGI1F github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw= github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= github.com/tmc/grpc-websocket-proxy v0.0.0-20201229170055-e5319fda7802/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U= -github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230316164812-df9d4ddc9292 h1:Uh7EE1UjpBBfyKQEiPMgXEP3rpcojsUDvMyzEkGUxXA= -github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230316164812-df9d4ddc9292/go.mod h1:B7LWK1eIP4gYf5grYWNCwMuMkaGqXJ3BJj+ZNe1Gbpw= -github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230417202714-aa24a76e6138 h1:CPmJ54U6rFzedOAXgYAeZqTJrtga9I8+1spBghS1mrQ= -github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230417202714-aa24a76e6138/go.mod h1:B7LWK1eIP4gYf5grYWNCwMuMkaGqXJ3BJj+ZNe1Gbpw= github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230420174123-f285168de9e5 h1:Ech3c2JxElUoXy3Rj77NivBZT8+7uB+bcyRSwgLLfL0= github.com/vmware/cloud-provider-for-cloud-director v0.0.0-20230420174123-f285168de9e5/go.mod h1:B7LWK1eIP4gYf5grYWNCwMuMkaGqXJ3BJj+ZNe1Gbpw= github.com/vmware/go-vcloud-director/v2 v2.15.0 h1:idQ9NsHLr2dOSLBC8KIdBMq7XOvPiWmfxgWNaf580mk=