From 04a8a6269dff4e3c78b24b5a3d45bddf46662070 Mon Sep 17 00:00:00 2001 From: Minhan Xia Date: Wed, 30 Mar 2022 10:47:51 -0700 Subject: [PATCH] upgrade golang version to 1.16 --- Makefile | 2 +- build/build.sh | 2 +- go.mod | 2 +- vendor/modules.txt | 24 ++++++++++++++++++++++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index da3d4233f5..cb8be6a22e 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ ARCH ?= amd64 ALL_ARCH := amd64 # Image to use for building. -BUILD_IMAGE ?= golang:1.13.9-alpine +BUILD_IMAGE ?= golang:1.16-alpine # Containers will be named: $(CONTAINER_PREFIX)-$(BINARY)-$(ARCH):$(VERSION). CONTAINER_PREFIX ?= ingress-gce diff --git a/build/build.sh b/build/build.sh index f9afc1de85..63b9e33d08 100755 --- a/build/build.sh +++ b/build/build.sh @@ -48,5 +48,5 @@ LD_FLAGS="-X ${PKG}/pkg/version.Version=${VERSION} -X ${PKG}/pkg/version.GitComm if echo "${TARGET}" | grep '.*-test$'; then go test -c -ldflags "${LD_FLAGS}" -o "${TARGET}" "${BIN_PKG}" else - go install -i -installsuffix "static" -ldflags "${LD_FLAGS}" "${BIN_PKG}" + go install -installsuffix "static" -ldflags "${LD_FLAGS}" "${BIN_PKG}" fi diff --git a/go.mod b/go.mod index 888f856c93..3966aa360b 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/ingress-gce -go 1.13 +go 1.16 require ( github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0 diff --git a/vendor/modules.txt b/vendor/modules.txt index 4b7aa77558..c41173d559 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,6 +1,7 @@ # cloud.google.com/go v0.97.0 cloud.google.com/go/compute/metadata # github.com/GoogleCloudPlatform/k8s-cloud-provider v1.18.0 +## explicit github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta @@ -86,6 +87,7 @@ github.com/go-openapi/jsonpointer # github.com/go-openapi/jsonreference v0.19.3 github.com/go-openapi/jsonreference # github.com/go-openapi/spec v0.19.3 +## explicit github.com/go-openapi/spec # github.com/go-openapi/swag v0.19.5 github.com/go-openapi/swag @@ -108,6 +110,7 @@ github.com/golang/protobuf/ptypes/struct github.com/golang/protobuf/ptypes/timestamp github.com/golang/protobuf/ptypes/wrappers # github.com/google/go-cmp v0.5.6 +## explicit github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags @@ -127,10 +130,12 @@ github.com/googleapis/gnostic/openapiv2 github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/imdario/mergo v0.3.7 +## explicit github.com/imdario/mergo # github.com/json-iterator/go v1.1.10 github.com/json-iterator/go # github.com/kr/pretty v0.2.0 +## explicit github.com/kr/pretty # github.com/kr/text v0.1.0 github.com/kr/text @@ -149,10 +154,12 @@ github.com/pkg/errors # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/prometheus/client_golang v1.7.1 +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp # github.com/prometheus/client_model v0.2.0 +## explicit github.com/prometheus/client_model/go # github.com/prometheus/common v0.10.0 github.com/prometheus/common/expfmt @@ -163,8 +170,10 @@ github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs github.com/prometheus/procfs/internal/util # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/stretchr/testify v1.6.1 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/require # go.opencensus.io v0.23.0 @@ -197,6 +206,7 @@ golang.org/x/net/idna golang.org/x/net/internal/timeseries golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20211005180243-6b3c2da341f1 +## explicit golang.org/x/oauth2 golang.org/x/oauth2/authhandler golang.org/x/oauth2/google @@ -217,6 +227,7 @@ golang.org/x/text/width # golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e golang.org/x/time/rate # google.golang.org/api v0.60.0 +## explicit google.golang.org/api/compute/v0.alpha google.golang.org/api/compute/v0.beta google.golang.org/api/compute/v1 @@ -386,6 +397,7 @@ google.golang.org/protobuf/types/known/structpb google.golang.org/protobuf/types/known/timestamppb google.golang.org/protobuf/types/known/wrapperspb # gopkg.in/gcfg.v1 v1.2.3 +## explicit gopkg.in/gcfg.v1 gopkg.in/gcfg.v1/scanner gopkg.in/gcfg.v1/token @@ -393,14 +405,17 @@ gopkg.in/gcfg.v1/types # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/warnings.v0 v0.1.2 +## explicit gopkg.in/warnings.v0 # gopkg.in/yaml.v2 v2.2.8 gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c gopkg.in/yaml.v3 # istio.io/api v0.0.0-20190809125725-591cf32c1d0e +## explicit istio.io/api/networking/v1alpha3 # k8s.io/api v0.20.0 +## explicit k8s.io/api/admissionregistration/v1 k8s.io/api/admissionregistration/v1beta1 k8s.io/api/apiserverinternal/v1alpha1 @@ -445,6 +460,7 @@ k8s.io/api/storage/v1 k8s.io/api/storage/v1alpha1 k8s.io/api/storage/v1beta1 # k8s.io/apiextensions-apiserver v0.20.0 +## explicit k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 @@ -456,6 +472,7 @@ k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextension k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1 k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/typed/apiextensions/v1beta1/fake # k8s.io/apimachinery v0.20.0 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -502,6 +519,7 @@ k8s.io/apimachinery/pkg/watch k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/client-go v0.20.0 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/fake k8s.io/client-go/dynamic @@ -730,27 +748,33 @@ k8s.io/client-go/util/keyutil k8s.io/client-go/util/retry k8s.io/client-go/util/workqueue # k8s.io/cloud-provider v0.20.0 +## explicit k8s.io/cloud-provider k8s.io/cloud-provider/service/helpers k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers # k8s.io/component-base v0.20.0 +## explicit k8s.io/component-base/config k8s.io/component-base/config/options k8s.io/component-base/metrics k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/version # k8s.io/klog v1.0.0 +## explicit k8s.io/klog # k8s.io/klog/v2 v2.4.0 k8s.io/klog/v2 # k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd +## explicit k8s.io/kube-openapi/pkg/common k8s.io/kube-openapi/pkg/util/proto # k8s.io/legacy-cloud-providers v0.20.0 +## explicit k8s.io/legacy-cloud-providers/gce # k8s.io/utils v0.0.0-20201110183641-67b214c5f920 +## explicit k8s.io/utils/buffer k8s.io/utils/integer k8s.io/utils/net