From 7001ea8ca6d629cd52058e21a5e8ef6942e48945 Mon Sep 17 00:00:00 2001 From: wanlin du Date: Fri, 18 Nov 2022 17:42:25 -0800 Subject: [PATCH 1/2] Bump up go version everywhere. This PR bump go version from 1.16 to 1.17 throughout the repo. --- config/defaults_template.yaml | 2 +- containers/init/ready/Dockerfile | 2 +- containers/pre_built_workers/go/Dockerfile | 2 +- containers/runtime/go/Dockerfile | 2 +- containers/runtime/xds-server/Dockerfile | 2 +- .../config/postgres_replicator/Dockerfile | 2 +- go.mod | 81 ++++++++++++++++++- 7 files changed, 84 insertions(+), 9 deletions(-) diff --git a/config/defaults_template.yaml b/config/defaults_template.yaml index 43139927..cc3e0b42 100644 --- a/config/defaults_template.yaml +++ b/config/defaults_template.yaml @@ -27,7 +27,7 @@ languages: runImage: "{{ .RunImagePrefix }}cxx:{{ .Version }}" - language: go - buildImage: golang:1.16 + buildImage: golang:1.17 runImage: "{{ .RunImagePrefix }}go:{{ .Version }}" - language: java diff --git a/containers/init/ready/Dockerfile b/containers/init/ready/Dockerfile index 2048d7fb..cf6b389a 100644 --- a/containers/init/ready/Dockerfile +++ b/containers/init/ready/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.16 +FROM golang:1.17 RUN mkdir -p /src/ready WORKDIR /src/ready diff --git a/containers/pre_built_workers/go/Dockerfile b/containers/pre_built_workers/go/Dockerfile index 5bf1fb1f..1be4f7b8 100644 --- a/containers/pre_built_workers/go/Dockerfile +++ b/containers/pre_built_workers/go/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.16 +FROM golang:1.17 RUN mkdir -p /executable WORKDIR /executable diff --git a/containers/runtime/go/Dockerfile b/containers/runtime/go/Dockerfile index 536c77a1..6fa64677 100644 --- a/containers/runtime/go/Dockerfile +++ b/containers/runtime/go/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.16 +FROM golang:1.17 RUN mkdir -p /src/workspace WORKDIR /src/workspace diff --git a/containers/runtime/xds-server/Dockerfile b/containers/runtime/xds-server/Dockerfile index 08c2656a..07a9955c 100644 --- a/containers/runtime/xds-server/Dockerfile +++ b/containers/runtime/xds-server/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM golang:1.16 +FROM golang:1.17 RUN mkdir /bootstrap WORKDIR /src/workspace diff --git a/dashboard/config/postgres_replicator/Dockerfile b/dashboard/config/postgres_replicator/Dockerfile index d973559e..7af26cc6 100644 --- a/dashboard/config/postgres_replicator/Dockerfile +++ b/dashboard/config/postgres_replicator/Dockerfile @@ -15,7 +15,7 @@ # syntax=docker/dockerfile:1 # Build replicator -FROM golang:1.16 AS builder +FROM golang:1.17 AS builder ARG REPOSITORY=grpc/test-infra ARG GITREF=master diff --git a/go.mod b/go.mod index 25fa3bfa..5ac9d04e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/grpc/test-infra -go 1.16 +go 1.17 require ( cloud.google.com/go/bigquery v1.4.0 @@ -13,8 +13,6 @@ require ( github.com/onsi/ginkgo v1.14.1 github.com/onsi/gomega v1.10.2 github.com/pkg/errors v0.9.1 - golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect - golang.org/x/tools v0.1.9 // indirect google.golang.org/api v0.20.0 google.golang.org/grpc v1.36.0 google.golang.org/protobuf v1.27.1 @@ -25,3 +23,80 @@ require ( sigs.k8s.io/controller-runtime v0.8.3 sigs.k8s.io/yaml v1.2.0 ) + +require ( + cloud.google.com/go v0.54.0 // indirect + github.com/Azure/go-autorest v14.2.0+incompatible // indirect + github.com/Azure/go-autorest/autorest v0.11.1 // indirect + github.com/Azure/go-autorest/autorest/adal v0.9.5 // indirect + github.com/Azure/go-autorest/autorest/date v0.3.0 // indirect + github.com/Azure/go-autorest/logger v0.2.0 // indirect + github.com/Azure/go-autorest/tracing v0.6.0 // indirect + github.com/BurntSushi/toml v0.3.1 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cncf/xds/go v0.0.0-20211001041855-01bcc9b48dfe // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/envoyproxy/protoc-gen-validate v0.1.0 // indirect + github.com/evanphx/json-patch v4.9.0+incompatible // indirect + github.com/form3tech-oss/jwt-go v3.2.2+incompatible // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-logr/zapr v0.2.0 // indirect + github.com/gogo/protobuf v1.3.1 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.0 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/googleapis/gax-go/v2 v2.0.5 // indirect + github.com/googleapis/gnostic v0.5.1 // indirect + github.com/hashicorp/golang-lru v0.5.4 // indirect + github.com/imdario/mergo v0.3.10 // indirect + github.com/jackc/chunkreader/v2 v2.0.1 // indirect + github.com/jackc/pgconn v1.10.1 // indirect + github.com/jackc/pgio v1.0.0 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgproto3/v2 v2.2.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20200714003250-2b9c44734f2b // indirect + github.com/jackc/pgtype v1.9.1 // indirect + github.com/jackc/puddle v1.2.0 // indirect + github.com/json-iterator/go v1.1.10 // indirect + github.com/jstemmer/go-junit-report v0.9.1 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/nxadm/tail v1.4.4 // indirect + github.com/prometheus/client_golang v1.7.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.2.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/valyala/bytebufferpool v1.0.0 // indirect + go.opencensus.io v0.22.3 // indirect + go.uber.org/atomic v1.6.0 // indirect + go.uber.org/multierr v1.5.0 // indirect + go.uber.org/zap v1.15.0 // indirect + golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97 // indirect + golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect + golang.org/x/mod v0.5.1 // indirect + golang.org/x/net v0.0.0-20211015210444-4f30a5c0130f // indirect + golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d // indirect + golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 // indirect + golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1 // indirect + golang.org/x/text v0.3.7 // indirect + golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e // indirect + golang.org/x/tools v0.1.9 // indirect + golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect + gomodules.xyz/jsonpatch/v2 v2.1.0 // indirect + google.golang.org/appengine v1.6.6 // indirect + google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect + gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776 // indirect + honnef.co/go/tools v0.0.1-2020.1.3 // indirect + k8s.io/apiextensions-apiserver v0.20.1 // indirect + k8s.io/component-base v0.20.2 // indirect + k8s.io/klog/v2 v2.4.0 // indirect + k8s.io/kube-openapi v0.0.0-20201113171705-d219536bb9fd // indirect + k8s.io/utils v0.0.0-20210111153108-fddb29f9d009 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.0.2 // indirect +) From 9e4187b79c0c85e77d4554b4495193e118c2abe7 Mon Sep 17 00:00:00 2001 From: Paulo Castello da Costa Date: Mon, 21 Nov 2022 11:49:19 -0800 Subject: [PATCH 2/2] Update golang version and go mod tidy. --- config/defaults_test.go | 2 +- containers/runtime/controller/Dockerfile | 2 +- controllers/suite_test.go | 2 +- dashboard/config/postgres_replicator/Dockerfile | 2 +- go.sum | 6 ------ podbuilder/suite_test.go | 2 +- 6 files changed, 5 insertions(+), 11 deletions(-) diff --git a/config/defaults_test.go b/config/defaults_test.go index 1732b809..423b7c90 100644 --- a/config/defaults_test.go +++ b/config/defaults_test.go @@ -47,7 +47,7 @@ var _ = Describe("Defaults", func() { }, { Language: "go", - BuildImage: "golang:1.16", + BuildImage: "golang:1.17", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, { diff --git a/containers/runtime/controller/Dockerfile b/containers/runtime/controller/Dockerfile index cda052fb..ed4523b5 100644 --- a/containers/runtime/controller/Dockerfile +++ b/containers/runtime/controller/Dockerfile @@ -1,5 +1,5 @@ # Build the manager binary -FROM golang:1.16 as builder +FROM golang:1.17 as builder WORKDIR /workspace # Copy the Go Modules manifests diff --git a/controllers/suite_test.go b/controllers/suite_test.go index d1bc9344..9bacbf1d 100644 --- a/controllers/suite_test.go +++ b/controllers/suite_test.go @@ -137,7 +137,7 @@ func newDefaults() *config.Defaults { }, { Language: "go", - BuildImage: "golang:1.16", + BuildImage: "golang:1.17", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, { diff --git a/dashboard/config/postgres_replicator/Dockerfile b/dashboard/config/postgres_replicator/Dockerfile index 7af26cc6..9134919d 100644 --- a/dashboard/config/postgres_replicator/Dockerfile +++ b/dashboard/config/postgres_replicator/Dockerfile @@ -25,7 +25,7 @@ RUN git clone https://github.com/$REPOSITORY.git src \ && make replicator REPLICATOR_OUTPUT_DIR=/ # Copy replicator binary and run it -FROM golang:1.16 +FROM golang:1.17 WORKDIR /app COPY --from=builder /replicator /app COPY config.yaml /app diff --git a/go.sum b/go.sum index 3e158660..c5330265 100644 --- a/go.sum +++ b/go.sum @@ -71,7 +71,6 @@ github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJm github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk= github.com/census-instrumentation/opencensus-proto v0.2.1 h1:glEXhBS5PSLLv4IXzLA5yPRVX4bilULVyxxbrfOtDAk= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= -github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= @@ -254,7 +253,6 @@ github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJ github.com/imdario/mergo v0.3.10 h1:6q5mVkdH/vYmqngx7kZQTjJ5HRsx+ImorDIEQ+beJgc= github.com/imdario/mergo v0.3.10/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= -github.com/jackc/chunkreader v1.0.0 h1:4s39bBR8ByfqH+DKm8rQA3E1LHZWB9XWcrz8fqaZbe0= github.com/jackc/chunkreader v1.0.0/go.mod h1:RT6O25fNZIuasFJRyZ4R/Y2BbhasbmZXF9QQ7T3kePo= github.com/jackc/chunkreader/v2 v2.0.0/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk= github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8= @@ -275,7 +273,6 @@ github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65 h1:DadwsjnMwFjfWc9y5W github.com/jackc/pgmock v0.0.0-20210724152146-4ad1a8207f65/go.mod h1:5R2h2EEX+qri8jOWMbJCtaPWkrrNc7OHwsp2TCqp7ak= github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= -github.com/jackc/pgproto3 v1.1.0 h1:FYYE4yRw+AgI8wXIinMlNjBbp/UitDJwfj5LqqewP1A= github.com/jackc/pgproto3 v1.1.0/go.mod h1:eR5FA3leWg7p9aeAqi37XOTgTIbkABlvcPB3E5rlc78= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190420180111-c116219b62db/go.mod h1:bhq50y+xrl9n5mRYyCBFKkpRVTLYJVWeCc+mEAI3yXA= github.com/jackc/pgproto3/v2 v2.0.0-alpha1.0.20190609003834-432c2951c711/go.mod h1:uH0AWtUmuShn0bcesswc4aBTWGvw0cAxIJp+6OB//Wg= @@ -476,7 +473,6 @@ github.com/valyala/bytebufferpool v1.0.0 h1:GqA5TC/0021Y/b9FG4Oi9Mr3q7XYx6Kllzaw github.com/valyala/bytebufferpool v1.0.0/go.mod h1:6bBcMArwyJ5K/AmCkWv1jt77kVWyCJ6HpOuEn7z0Csc= github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU= github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74= -github.com/yuin/goldmark v1.4.1/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= @@ -602,7 +598,6 @@ golang.org/x/sync v0.0.0-20190227155943-e225da77a7e6/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ= -golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -646,7 +641,6 @@ golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20201112073958-5cba982894dd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210119212857-b64e53b001e4/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654 h1:id054HUawV2/6IGm2IV8KZQjqtwAOo2CYlOToYqa0d0= golang.org/x/sys v0.0.0-20211019181941-9d821ace8654/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= diff --git a/podbuilder/suite_test.go b/podbuilder/suite_test.go index b55b06ac..e9749c1a 100644 --- a/podbuilder/suite_test.go +++ b/podbuilder/suite_test.go @@ -96,7 +96,7 @@ func newDefaults() *config.Defaults { }, { Language: "go", - BuildImage: "golang:1.16", + BuildImage: "golang:1.17", RunImage: "gcr.io/grpc-fake-project/test-infra/go", }, {