From 8b8be5c4187f675b602a109a2b23141c3290c0ef Mon Sep 17 00:00:00 2001 From: Ben Einaudi Date: Tue, 3 Mar 2020 10:18:12 +0100 Subject: [PATCH] Migrate to golang 1.14 * Upgrade go.mod file * Upgrade travis file * Run rm -rf vendor && go mod tidy && go mod vendor to upgrade vendor/modules.txt according to golang 1.14 * Upgrade golangci-lint version --- .travis.yml | 2 +- deploy/Dockerfile | 2 +- deploy/Dockerfile_debug | 2 +- deploy/Dockerfile_warmer | 2 +- go.mod | 2 +- hack/linter.sh | 2 +- vendor/modules.txt | 68 ++++++++++++++++++++++++++++++++++++++++ 7 files changed, 74 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index df05f880ad..4b3d90651e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: bionic env: - IMAGE_REPO=localhost:5000 go: - - "1.13.3" + - "1.14" go_import_path: github.com/GoogleContainerTools/kaniko jobs: include: diff --git a/deploy/Dockerfile b/deploy/Dockerfile index 2e1b1fb9ba..c83d0ab08d 100644 --- a/deploy/Dockerfile +++ b/deploy/Dockerfile @@ -14,7 +14,7 @@ # Builds the static Go image to execute in a Kubernetes job -FROM golang:1.13 +FROM golang:1.14 ARG GOARCH=amd64 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko # Get GCR credential helper diff --git a/deploy/Dockerfile_debug b/deploy/Dockerfile_debug index e9ccf15e3f..e0e85a5387 100644 --- a/deploy/Dockerfile_debug +++ b/deploy/Dockerfile_debug @@ -15,7 +15,7 @@ # Builds the static Go image to execute in a Kubernetes job # Stage 0: Build the executor binary and get credential helpers -FROM golang:1.13 +FROM golang:1.14 ARG GOARCH=amd64 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko # Get GCR credential helper diff --git a/deploy/Dockerfile_warmer b/deploy/Dockerfile_warmer index d33d2d74b1..6628ed8bc5 100644 --- a/deploy/Dockerfile_warmer +++ b/deploy/Dockerfile_warmer @@ -14,7 +14,7 @@ # Builds the static Go image to execute in a Kubernetes job -FROM golang:1.13 +FROM golang:1.14 ARG GOARCH=amd64 WORKDIR /go/src/github.com/GoogleContainerTools/kaniko # Get GCR credential helper diff --git a/go.mod b/go.mod index c336c71529..9540319071 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/GoogleContainerTools/kaniko -go 1.13 +go 1.14 replace ( github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf => github.com/containerd/containerd v0.0.0-20191014053712-acdcf13d5eaf diff --git a/hack/linter.sh b/hack/linter.sh index 6b61e1aa6d..41d539b19e 100755 --- a/hack/linter.sh +++ b/hack/linter.sh @@ -20,7 +20,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" if ! [ -x "$(command -v golangci-lint)" ]; then echo "Installing GolangCI-Lint" - ${DIR}/install_golint.sh -b $GOPATH/bin v1.21.0 + ${DIR}/install_golint.sh -b $GOPATH/bin v1.23.7 fi golangci-lint run diff --git a/vendor/modules.txt b/vendor/modules.txt index d8704fce8b..28ccf9be6d 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # cloud.google.com/go v0.26.0 +## explicit cloud.google.com/go/compute/metadata cloud.google.com/go/iam cloud.google.com/go/internal @@ -7,11 +8,13 @@ cloud.google.com/go/internal/trace cloud.google.com/go/internal/version cloud.google.com/go/storage # github.com/Azure/azure-pipeline-go v0.2.2 +## explicit github.com/Azure/azure-pipeline-go/pipeline # github.com/Azure/azure-sdk-for-go v19.1.1+incompatible github.com/Azure/azure-sdk-for-go/services/containerregistry/mgmt/2017-10-01/containerregistry github.com/Azure/azure-sdk-for-go/version # github.com/Azure/azure-storage-blob-go v0.8.0 +## explicit github.com/Azure/azure-storage-blob-go/azblob # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 github.com/Azure/go-ansiterm @@ -28,7 +31,12 @@ github.com/Azure/go-autorest/version # github.com/Microsoft/go-winio v0.4.14 github.com/Microsoft/go-winio github.com/Microsoft/go-winio/pkg/guid +# github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 +## explicit +# github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 +## explicit # github.com/aws/aws-sdk-go v1.25.19 +## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/awserr github.com/aws/aws-sdk-go/aws/awsutil @@ -71,6 +79,7 @@ github.com/aws/aws-sdk-go/service/s3/s3manager github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973 +## explicit github.com/beorn7/perks/quantile # github.com/containerd/containerd v1.4.0-0.20191014053712-acdcf13d5eaf => github.com/containerd/containerd v0.0.0-20191014053712-acdcf13d5eaf github.com/containerd/containerd/cio @@ -102,6 +111,7 @@ github.com/docker/distribution/digestset github.com/docker/distribution/reference github.com/docker/distribution/registry/api/errcode # github.com/docker/docker v1.14.0-0.20190319215453-e7b5f7dbe98c => github.com/docker/docker v0.0.0-20190319215453-e7b5f7dbe98c +## explicit github.com/docker/docker/api github.com/docker/docker/api/types github.com/docker/docker/api/types/backend @@ -194,10 +204,12 @@ github.com/docker/go-connections/tlsconfig # github.com/docker/go-events v0.0.0-20170721190031-9461782956ad github.com/docker/go-events # github.com/docker/go-metrics v0.0.0-20180209012529-399ea8c73916 +## explicit github.com/docker/go-metrics # github.com/docker/go-units v0.4.0 github.com/docker/go-units # github.com/docker/swarmkit v1.12.1-0.20180726190244-7567d47988d8 +## explicit github.com/docker/swarmkit/agent/exec github.com/docker/swarmkit/api github.com/docker/swarmkit/api/deepcopy @@ -207,18 +219,24 @@ github.com/docker/swarmkit/manager/raftselector github.com/docker/swarmkit/protobuf/plugin github.com/docker/swarmkit/protobuf/ptypes # github.com/emirpasic/gods v1.9.0 +## explicit github.com/emirpasic/gods/containers github.com/emirpasic/gods/lists github.com/emirpasic/gods/lists/arraylist github.com/emirpasic/gods/trees github.com/emirpasic/gods/trees/binaryheap github.com/emirpasic/gods/utils +# github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 +## explicit # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify # github.com/genuinetools/amicontained v0.4.3 +## explicit github.com/genuinetools/amicontained/container # github.com/ghodss/yaml v1.0.0 github.com/ghodss/yaml +# github.com/gliderlabs/ssh v0.2.2 +## explicit # github.com/gogo/protobuf v1.2.2-0.20190723190241-65acae22fc9d github.com/gogo/protobuf/gogoproto github.com/gogo/protobuf/proto @@ -228,6 +246,7 @@ github.com/gogo/protobuf/types # github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b github.com/golang/glog # github.com/golang/mock v1.3.1 +## explicit github.com/golang/mock/gomock # github.com/golang/protobuf v1.3.2 github.com/golang/protobuf/proto @@ -239,12 +258,14 @@ github.com/golang/protobuf/ptypes/timestamp # github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a github.com/google/btree # github.com/google/go-cmp v0.3.0 +## explicit github.com/google/go-cmp/cmp github.com/google/go-cmp/cmp/internal/diff github.com/google/go-cmp/cmp/internal/flags github.com/google/go-cmp/cmp/internal/function github.com/google/go-cmp/cmp/internal/value # github.com/google/go-containerregistry v0.0.0-20191218175032-34fb8ff33bed +## explicit github.com/google/go-containerregistry/pkg/authn github.com/google/go-containerregistry/pkg/authn/k8schain github.com/google/go-containerregistry/pkg/internal/retry @@ -266,12 +287,19 @@ github.com/google/go-containerregistry/pkg/v1/types github.com/google/go-containerregistry/pkg/v1/v1util github.com/google/go-containerregistry/pkg/v1/validate # github.com/google/go-github v17.0.0+incompatible +## explicit github.com/google/go-github/github # github.com/google/go-querystring v1.0.0 +## explicit github.com/google/go-querystring/query # github.com/google/gofuzz v1.0.0 github.com/google/gofuzz +# github.com/google/martian v2.1.0+incompatible +## explicit +# github.com/google/uuid v1.0.0 +## explicit # github.com/googleapis/gax-go v2.0.0+incompatible +## explicit github.com/googleapis/gax-go # github.com/googleapis/gnostic v0.2.2 github.com/googleapis/gnostic/OpenAPIv2 @@ -285,34 +313,45 @@ github.com/grpc-ecosystem/grpc-opentracing/go/otgrpc # github.com/hashicorp/go-immutable-radix v1.0.0 github.com/hashicorp/go-immutable-radix # github.com/hashicorp/go-memdb v0.0.0-20180223233045-1289e7fffe71 +## explicit github.com/hashicorp/go-memdb +# github.com/hashicorp/go-uuid v1.0.1 +## explicit # github.com/hashicorp/golang-lru v0.5.0 github.com/hashicorp/golang-lru/simplelru # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap # github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 +## explicit github.com/jbenet/go-context/io # github.com/jmespath/go-jmespath v0.0.0-20180206201540-c2b33e8439af github.com/jmespath/go-jmespath # github.com/json-iterator/go v1.1.8 github.com/json-iterator/go # github.com/karrick/godirwalk v1.7.7 +## explicit github.com/karrick/godirwalk # github.com/kevinburke/ssh_config v0.0.0-20180830205328-81db2a75821e +## explicit github.com/kevinburke/ssh_config # github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences # github.com/mattn/go-ieproxy v0.0.0-20190805055040-f9202b1cfdeb +## explicit github.com/mattn/go-ieproxy # github.com/mattn/go-shellwords v1.0.3 +## explicit github.com/mattn/go-shellwords # github.com/matttproud/golang_protobuf_extensions v1.0.1 +## explicit github.com/matttproud/golang_protobuf_extensions/pbutil # github.com/minio/highwayhash v1.0.0 +## explicit github.com/minio/highwayhash # github.com/mitchellh/go-homedir v1.1.0 github.com/mitchellh/go-homedir # github.com/moby/buildkit v0.0.0-20191111154543-00bfbab0390c +## explicit github.com/moby/buildkit/frontend/dockerfile/command github.com/moby/buildkit/frontend/dockerfile/instructions github.com/moby/buildkit/frontend/dockerfile/parser @@ -338,28 +377,37 @@ github.com/opencontainers/runc/libcontainer/devices github.com/opencontainers/runc/libcontainer/system github.com/opencontainers/runc/libcontainer/user # github.com/opencontainers/runtime-spec v1.0.1 +## explicit github.com/opencontainers/runtime-spec/specs-go # github.com/opencontainers/selinux v1.0.0-rc1 +## explicit github.com/opencontainers/selinux/go-selinux github.com/opencontainers/selinux/go-selinux/label # github.com/opentracing/opentracing-go v1.0.2 +## explicit github.com/opentracing/opentracing-go github.com/opentracing/opentracing-go/ext github.com/opentracing/opentracing-go/log # github.com/otiai10/copy v1.0.2 +## explicit github.com/otiai10/copy # github.com/pelletier/go-buffruneio v0.2.0 +## explicit github.com/pelletier/go-buffruneio # github.com/peterbourgon/diskv v2.0.1+incompatible github.com/peterbourgon/diskv # github.com/pkg/errors v0.8.1 +## explicit github.com/pkg/errors # github.com/prometheus/client_golang v0.9.0-pre1.0.20180210140205-a40133b69fbd +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/promhttp # github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910 +## explicit github.com/prometheus/client_model/go # github.com/prometheus/common v0.0.0-20180518154759-7600349dcfe1 +## explicit github.com/prometheus/common/expfmt github.com/prometheus/common/internal/bitbucket.org/ww/goautoneg github.com/prometheus/common/model @@ -367,17 +415,23 @@ github.com/prometheus/common/model github.com/prometheus/procfs github.com/prometheus/procfs/internal/fs # github.com/sergi/go-diff v1.0.0 +## explicit github.com/sergi/go-diff/diffmatchpatch # github.com/sirupsen/logrus v1.4.2 +## explicit github.com/sirupsen/logrus # github.com/spf13/afero v1.2.1 +## explicit github.com/spf13/afero github.com/spf13/afero/mem # github.com/spf13/cobra v0.0.5 +## explicit github.com/spf13/cobra # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/src-d/gcfg v1.3.0 +## explicit github.com/src-d/gcfg github.com/src-d/gcfg/scanner github.com/src-d/gcfg/token @@ -385,17 +439,21 @@ github.com/src-d/gcfg/types # github.com/syndtr/gocapability v0.0.0-20180916011248-d98352740cb2 github.com/syndtr/gocapability/capability # github.com/tonistiigi/fsutil v0.0.0-20191018213012-0f039a052ca1 +## explicit github.com/tonistiigi/fsutil github.com/tonistiigi/fsutil/types # github.com/vbatts/tar-split v0.10.2 +## explicit github.com/vbatts/tar-split/archive/tar github.com/vbatts/tar-split/tar/asm github.com/vbatts/tar-split/tar/storage # github.com/xanzy/ssh-agent v0.2.0 +## explicit github.com/xanzy/ssh-agent # go.etcd.io/bbolt v1.3.3 go.etcd.io/bbolt # go.opencensus.io v0.14.0 +## explicit go.opencensus.io go.opencensus.io/exporter/stackdriver/propagation go.opencensus.io/internal @@ -430,6 +488,7 @@ golang.org/x/crypto/ssh/agent golang.org/x/crypto/ssh/knownhosts golang.org/x/crypto/ssh/terminal # golang.org/x/net v0.0.0-20191004110552-13f9640d40b9 +## explicit golang.org/x/net/context golang.org/x/net/context/ctxhttp golang.org/x/net/http/httpguts @@ -442,12 +501,14 @@ golang.org/x/net/internal/timeseries golang.org/x/net/proxy golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be +## explicit golang.org/x/oauth2 golang.org/x/oauth2/google golang.org/x/oauth2/internal golang.org/x/oauth2/jws golang.org/x/oauth2/jwt # golang.org/x/sync v0.0.0-20190423024810-112230192c58 +## explicit golang.org/x/sync/errgroup golang.org/x/sync/singleflight golang.org/x/sync/syncmap @@ -464,6 +525,7 @@ golang.org/x/text/unicode/norm # golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2 golang.org/x/time/rate # google.golang.org/api v0.0.0-20180730000901-31ca0e01cd79 +## explicit google.golang.org/api/gensupport google.golang.org/api/googleapi google.golang.org/api/googleapi/internal/uritemplates @@ -528,12 +590,16 @@ google.golang.org/grpc/tap # gopkg.in/inf.v0 v0.9.1 gopkg.in/inf.v0 # gopkg.in/src-d/go-billy.v4 v4.2.0 +## explicit gopkg.in/src-d/go-billy.v4 gopkg.in/src-d/go-billy.v4/helper/chroot gopkg.in/src-d/go-billy.v4/helper/polyfill gopkg.in/src-d/go-billy.v4/osfs gopkg.in/src-d/go-billy.v4/util +# gopkg.in/src-d/go-git-fixtures.v3 v3.5.0 +## explicit # gopkg.in/src-d/go-git.v4 v4.6.0 +## explicit gopkg.in/src-d/go-git.v4 gopkg.in/src-d/go-git.v4/config gopkg.in/src-d/go-git.v4/internal/revision @@ -575,6 +641,7 @@ gopkg.in/src-d/go-git.v4/utils/merkletrie/index gopkg.in/src-d/go-git.v4/utils/merkletrie/internal/frame gopkg.in/src-d/go-git.v4/utils/merkletrie/noder # gopkg.in/warnings.v0 v0.1.2 +## explicit gopkg.in/warnings.v0 # gopkg.in/yaml.v2 v2.2.4 gopkg.in/yaml.v2 @@ -699,3 +766,4 @@ k8s.io/kubernetes/pkg/credentialprovider/aws k8s.io/kubernetes/pkg/credentialprovider/azure k8s.io/kubernetes/pkg/credentialprovider/gcp k8s.io/kubernetes/pkg/credentialprovider/secrets +# github.com/tonistiigi/fsutil v0.0.0-20190819224149-3d2716dd0a4d => github.com/tonistiigi/fsutil v0.0.0-20191018213012-0f039a052ca1