From 78b57bdec9fac5ba8f26f5ffa659d11e1c03d80d Mon Sep 17 00:00:00 2001 From: Peter Rifel Date: Sun, 5 Jul 2020 16:53:54 -0500 Subject: [PATCH] Upgrade to go 1.14.4 --- .github/workflows/main.yml | 4 +- .travis.yml | 2 +- Makefile | 7 +- WORKSPACE | 2 +- docker/Dockerfile | 2 +- go.mod | 2 +- hack/make-apimachinery.sh | 9 +-- images/dns-controller-builder/Dockerfile | 2 +- images/protokube-builder/Dockerfile | 2 +- vendor/modules.txt | 95 ++++++++++++++++++++++++ 10 files changed, 109 insertions(+), 18 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 9d48175f66524..7833b54579308 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -20,7 +20,7 @@ jobs: go: [1.13, 1.14] exclude: - os: macos-10.15 - go: 1.14 + go: 1.13 fail-fast: true runs-on: ${{ matrix.os }} @@ -45,7 +45,7 @@ jobs: strategy: matrix: os: [ubuntu-18.04] - go: [1.13] + go: [1.14] fail-fast: true runs-on: ${{ matrix.os }} diff --git a/.travis.yml b/.travis.yml index 532b249e11768..d70440e51a62b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,6 @@ jobs: - name: Verify arch: amd64 os: linux - go: 1.13.x + go: 1.14.x script: - GOPROXY=https://proxy.golang.org make travis-ci diff --git a/Makefile b/Makefile index c6ac83c8371de..dec9e3e43c6b7 100644 --- a/Makefile +++ b/Makefile @@ -23,7 +23,7 @@ GCS_URL=$(GCS_LOCATION:gs://%=https://storage.googleapis.com/%) LATEST_FILE?=latest-ci.txt GOPATH_1ST:=$(shell go env | grep GOPATH | cut -f 2 -d \") UNIQUE:=$(shell date +%s) -GOVERSION=1.13.9 +GOVERSION=1.14.4 BUILD=$(KOPS_ROOT)/.build LOCAL=$(BUILD)/local BINDATA_TARGETS=upup/models/bindata.go @@ -45,9 +45,6 @@ BAZEL_CONFIG?= API_OPTIONS?= GCFLAGS?= -# This can be removed when we upgrade to go 1.14 -export GOFLAGS=-mod=vendor - UPLOAD_CMD=$(KOPS_ROOT)/hack/upload # Unexport environment variables that can affect tests and are not used in builds @@ -448,7 +445,7 @@ gomod-prereqs: .PHONY: gomod gomod: gomod-prereqs - GO111MODULE=on GOFLAGS= go mod vendor + GO111MODULE=on go mod vendor # Switch weavemesh to use peer_name_hash - bazel rule-go doesn't support build tags yet rm vendor/github.com/weaveworks/mesh/peer_name_mac.go sed -i -e 's/peer_name_hash/!peer_name_mac/g' vendor/github.com/weaveworks/mesh/peer_name_hash.go diff --git a/WORKSPACE b/WORKSPACE index 4bbef79764528..c6609acdf56b4 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -27,7 +27,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() go_register_toolchains( - go_version = "1.13.9", + go_version = "1.14.4", ) load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository") diff --git a/docker/Dockerfile b/docker/Dockerfile index b01ee72465092..1b47639693b00 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -14,7 +14,7 @@ FROM alpine:3.8 -ARG GO_VERSION=1.13.9 +ARG GO_VERSION=1.14.4 # KOPS_GITISH: Modify to build at an explicit tag/gitish ARG KOPS_GITISH=release diff --git a/go.mod b/go.mod index b6ccfd86da7e0..83061f8faf0af 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module k8s.io/kops -go 1.13 +go 1.14 // Version kubernetes-1.18.0 => tag v0.18.1 diff --git a/hack/make-apimachinery.sh b/hack/make-apimachinery.sh index 2d313e4ec799a..9adbbc0d7e5d2 100755 --- a/hack/make-apimachinery.sh +++ b/hack/make-apimachinery.sh @@ -30,16 +30,15 @@ mkdir -p "${WORK_DIR}/go/" cp -R "${GOPATH}/src/k8s.io/kops/vendor/" "${WORK_DIR}/go/src" unset GOBIN -unset GOFLAGS -env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -v k8s.io/code-generator/cmd/conversion-gen/ +env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod -v k8s.io/code-generator/cmd/conversion-gen/ cp "${WORK_DIR}/go/bin/conversion-gen" "${GOPATH}/bin/" -env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/deepcopy-gen/ +env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/deepcopy-gen/ cp "${WORK_DIR}/go/bin/deepcopy-gen" "${GOPATH}/bin/" -env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/defaulter-gen/ +env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/defaulter-gen/ cp "${WORK_DIR}/go/bin/defaulter-gen" "${GOPATH}/bin/" -env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install k8s.io/code-generator/cmd/client-gen/ +env GOBIN="${WORK_DIR}/go/bin" GOPATH="${WORK_DIR}/go/" go install -mod=mod k8s.io/code-generator/cmd/client-gen/ cp "${WORK_DIR}/go/bin/client-gen" "${GOPATH}/bin/" \ No newline at end of file diff --git a/images/dns-controller-builder/Dockerfile b/images/dns-controller-builder/Dockerfile index f11cc85266997..c160fab54228d 100644 --- a/images/dns-controller-builder/Dockerfile +++ b/images/dns-controller-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.14.4.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh diff --git a/images/protokube-builder/Dockerfile b/images/protokube-builder/Dockerfile index f11cc85266997..c160fab54228d 100644 --- a/images/protokube-builder/Dockerfile +++ b/images/protokube-builder/Dockerfile @@ -24,7 +24,7 @@ RUN apt-get update && apt-get install --yes --reinstall lsb-base \ && rm -rf /var/lib/apt/lists/* # Install golang -RUN curl -L https://storage.googleapis.com/golang/go1.13.9.linux-amd64.tar.gz | tar zx -C /usr/local +RUN curl -L https://storage.googleapis.com/golang/go1.14.4.linux-amd64.tar.gz | tar zx -C /usr/local ENV PATH $PATH:/usr/local/go/bin COPY onbuild.sh /onbuild.sh diff --git a/vendor/modules.txt b/vendor/modules.txt index 566acaaacb162..074593ba73e09 100644 --- a/vendor/modules.txt +++ b/vendor/modules.txt @@ -1,4 +1,5 @@ # cloud.google.com/go v0.38.0 +## explicit cloud.google.com/go/compute/metadata # github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 github.com/Azure/go-ansiterm @@ -22,12 +23,16 @@ github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/filter github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/meta github.com/GoogleCloudPlatform/k8s-cloud-provider/pkg/cloud/mock # github.com/MakeNowJust/heredoc v0.0.0-20170808103936-bb23615498cd +## explicit github.com/MakeNowJust/heredoc # github.com/Masterminds/semver v1.3.1 +## explicit github.com/Masterminds/semver # github.com/Masterminds/sprig v2.17.1+incompatible +## explicit github.com/Masterminds/sprig # github.com/Microsoft/go-winio v0.4.14 +## explicit github.com/Microsoft/go-winio github.com/Microsoft/go-winio/pkg/guid # github.com/PuerkitoBio/purell v1.1.1 @@ -37,6 +42,7 @@ github.com/PuerkitoBio/urlesc # github.com/agext/levenshtein v1.2.1 github.com/agext/levenshtein # github.com/aliyun/alibaba-cloud-sdk-go v1.61.264 +## explicit github.com/aliyun/alibaba-cloud-sdk-go/sdk github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth github.com/aliyun/alibaba-cloud-sdk-go/sdk/auth/credentials @@ -49,12 +55,14 @@ github.com/aliyun/alibaba-cloud-sdk-go/sdk/responses github.com/aliyun/alibaba-cloud-sdk-go/sdk/utils github.com/aliyun/alibaba-cloud-sdk-go/services/slb # github.com/aokoli/goutils v1.0.1 +## explicit github.com/aokoli/goutils # github.com/apparentlymart/go-textseg v1.0.0 github.com/apparentlymart/go-textseg/textseg # github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da github.com/armon/go-metrics # github.com/aws/aws-sdk-go v1.30.16 +## explicit github.com/aws/aws-sdk-go/aws github.com/aws/aws-sdk-go/aws/arn github.com/aws/aws-sdk-go/aws/awserr @@ -114,6 +122,7 @@ github.com/aws/aws-sdk-go/service/s3/internal/arn github.com/aws/aws-sdk-go/service/sts github.com/aws/aws-sdk-go/service/sts/stsiface # github.com/bazelbuild/bazel-gazelle v0.19.1 +## explicit github.com/bazelbuild/bazel-gazelle/cmd/gazelle github.com/bazelbuild/bazel-gazelle/config github.com/bazelbuild/bazel-gazelle/flag @@ -137,16 +146,20 @@ github.com/beorn7/perks/quantile # github.com/blang/semver v3.5.0+incompatible github.com/blang/semver # github.com/blang/semver/v4 v4.0.0 +## explicit github.com/blang/semver/v4 # github.com/chai2010/gettext-go v0.0.0-20170215093142-bf70f2a70fb1 +## explicit github.com/chai2010/gettext-go/gettext github.com/chai2010/gettext-go/gettext/mo github.com/chai2010/gettext-go/gettext/plural github.com/chai2010/gettext-go/gettext/po # github.com/client9/misspell v0.3.4 +## explicit github.com/client9/misspell github.com/client9/misspell/cmd/misspell # github.com/coreos/etcd v3.3.17+incompatible +## explicit github.com/coreos/etcd/client github.com/coreos/etcd/pkg/pathutil github.com/coreos/etcd/pkg/srv @@ -159,6 +172,7 @@ github.com/cpuguy83/go-md2man/md2man # github.com/davecgh/go-spew v1.1.1 github.com/davecgh/go-spew/spew # github.com/denverdino/aliyungo v0.0.0-20191128015008-acd8035bbb1d +## explicit github.com/denverdino/aliyungo/common github.com/denverdino/aliyungo/ecs github.com/denverdino/aliyungo/ess @@ -170,6 +184,7 @@ github.com/denverdino/aliyungo/util # github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/dgrijalva/jwt-go # github.com/digitalocean/godo v1.19.0 +## explicit github.com/digitalocean/godo # github.com/docker/distribution v2.7.1+incompatible github.com/docker/distribution/digestset @@ -178,6 +193,7 @@ github.com/docker/distribution/reference github.com/docker/docker/pkg/term github.com/docker/docker/pkg/term/windows # github.com/docker/engine-api v0.0.0-20160509170047-dea108d3aa0c +## explicit github.com/docker/engine-api/client github.com/docker/engine-api/client/transport github.com/docker/engine-api/client/transport/cancellable @@ -192,12 +208,14 @@ github.com/docker/engine-api/types/strslice github.com/docker/engine-api/types/time github.com/docker/engine-api/types/versions # github.com/docker/go-connections v0.4.0 +## explicit github.com/docker/go-connections/nat github.com/docker/go-connections/sockets github.com/docker/go-connections/tlsconfig # github.com/docker/go-units v0.4.0 github.com/docker/go-units # github.com/docker/spdystream v0.0.0-20181023171402-6480d4af844c +## explicit github.com/docker/spdystream github.com/docker/spdystream/spdy # github.com/emicklei/go-restful v2.9.6+incompatible @@ -212,15 +230,20 @@ github.com/fatih/color # github.com/fsnotify/fsnotify v1.4.7 github.com/fsnotify/fsnotify # github.com/fullsailor/pkcs7 v0.0.0-20180422025557-ae226422660e +## explicit github.com/fullsailor/pkcs7 # github.com/ghodss/yaml v1.0.0 +## explicit github.com/ghodss/yaml # github.com/go-bindata/go-bindata v3.1.2+incompatible +## explicit github.com/go-bindata/go-bindata github.com/go-bindata/go-bindata/go-bindata # github.com/go-ini/ini v1.51.0 +## explicit github.com/go-ini/ini # github.com/go-logr/logr v0.1.0 +## explicit github.com/go-logr/logr # github.com/go-openapi/jsonpointer v0.19.3 github.com/go-openapi/jsonpointer @@ -233,6 +256,7 @@ github.com/go-openapi/swag # github.com/gobuffalo/flect v0.2.0 github.com/gobuffalo/flect # github.com/gogo/protobuf v1.3.1 +## explicit github.com/gogo/protobuf/gogoproto github.com/gogo/protobuf/proto github.com/gogo/protobuf/protoc-gen-gogo/descriptor @@ -240,6 +264,7 @@ github.com/gogo/protobuf/sortkeys # github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6 github.com/golang/groupcache/lru # github.com/golang/protobuf v1.3.3 +## explicit github.com/golang/protobuf/proto github.com/golang/protobuf/ptypes github.com/golang/protobuf/ptypes/any @@ -268,6 +293,7 @@ github.com/googleapis/gnostic/OpenAPIv2 github.com/googleapis/gnostic/compiler github.com/googleapis/gnostic/extensions # github.com/gophercloud/gophercloud v0.7.1-0.20200116011225-46fdd1830e9a => github.com/gophercloud/gophercloud v0.9.0 +## explicit github.com/gophercloud/gophercloud github.com/gophercloud/gophercloud/internal github.com/gophercloud/gophercloud/openstack @@ -309,6 +335,7 @@ github.com/gophercloud/gophercloud/openstack/objectstorage/v1/objects github.com/gophercloud/gophercloud/openstack/utils github.com/gophercloud/gophercloud/pagination # github.com/gorilla/mux v1.7.3 +## explicit github.com/gorilla/mux # github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 github.com/gregjones/httpcache @@ -335,6 +362,7 @@ github.com/hashicorp/go-version github.com/hashicorp/golang-lru github.com/hashicorp/golang-lru/simplelru # github.com/hashicorp/hcl v1.0.0 +## explicit github.com/hashicorp/hcl github.com/hashicorp/hcl/hcl/ast github.com/hashicorp/hcl/hcl/parser @@ -346,6 +374,7 @@ github.com/hashicorp/hcl/json/parser github.com/hashicorp/hcl/json/scanner github.com/hashicorp/hcl/json/token # github.com/hashicorp/hcl/v2 v2.3.0 +## explicit github.com/hashicorp/hcl/v2 github.com/hashicorp/hcl/v2/ext/customdecode github.com/hashicorp/hcl/v2/hclsyntax @@ -353,6 +382,7 @@ github.com/hashicorp/hcl/v2/hclwrite # github.com/hashicorp/memberlist v0.1.4 github.com/hashicorp/memberlist # github.com/hashicorp/vault/api v1.0.4 +## explicit github.com/hashicorp/vault/api # github.com/hashicorp/vault/sdk v0.1.13 github.com/hashicorp/vault/sdk/helper/compressutil @@ -362,23 +392,27 @@ github.com/hashicorp/vault/sdk/helper/jsonutil github.com/hashicorp/vault/sdk/helper/parseutil github.com/hashicorp/vault/sdk/helper/strutil # github.com/huandu/xstrings v1.2.0 +## explicit github.com/huandu/xstrings # github.com/imdario/mergo v0.3.7 github.com/imdario/mergo # github.com/inconshreveable/mousetrap v1.0.0 github.com/inconshreveable/mousetrap # github.com/jacksontj/memberlistmesh v0.0.0-20190905163944-93462b9d2bb7 +## explicit github.com/jacksontj/memberlistmesh github.com/jacksontj/memberlistmesh/clusterpb # github.com/jmespath/go-jmespath v0.3.0 github.com/jmespath/go-jmespath # github.com/jpillora/backoff v0.0.0-20170918002102-8eab2debe79d +## explicit github.com/jpillora/backoff # github.com/json-iterator/go v1.1.8 github.com/json-iterator/go # github.com/konsorten/go-windows-terminal-sequences v1.0.2 github.com/konsorten/go-windows-terminal-sequences # github.com/kr/fs v0.1.0 +## explicit github.com/kr/fs # github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de github.com/liggitt/tabwriter @@ -395,6 +429,7 @@ github.com/mattn/go-isatty # github.com/matttproud/golang_protobuf_extensions v1.0.1 github.com/matttproud/golang_protobuf_extensions/pbutil # github.com/miekg/coredns v0.0.0-20161111164017-20e25559d5ea +## explicit github.com/miekg/coredns/middleware/etcd/msg # github.com/miekg/dns v1.1.16 github.com/miekg/dns @@ -403,6 +438,7 @@ github.com/mitchellh/go-homedir # github.com/mitchellh/go-wordwrap v1.0.0 github.com/mitchellh/go-wordwrap # github.com/mitchellh/mapstructure v1.1.2 +## explicit github.com/mitchellh/mapstructure # github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd github.com/modern-go/concurrent @@ -422,10 +458,12 @@ github.com/pierrec/lz4/internal/xxh32 # github.com/pkg/errors v0.9.1 github.com/pkg/errors # github.com/pkg/sftp v0.0.0-20160930220758-4d0e916071f6 +## explicit github.com/pkg/sftp # github.com/pmezard/go-difflib v1.0.0 github.com/pmezard/go-difflib/difflib # github.com/prometheus/client_golang v1.0.0 +## explicit github.com/prometheus/client_golang/prometheus github.com/prometheus/client_golang/prometheus/internal github.com/prometheus/client_golang/prometheus/promhttp @@ -445,6 +483,7 @@ github.com/ryanuber/go-glob # github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529 github.com/sean-/seed # github.com/sergi/go-diff v1.0.0 +## explicit github.com/sergi/go-diff/diffmatchpatch # github.com/sirupsen/logrus v1.4.2 github.com/sirupsen/logrus @@ -454,15 +493,19 @@ github.com/spf13/afero/mem # github.com/spf13/cast v1.3.0 github.com/spf13/cast # github.com/spf13/cobra v0.0.5 +## explicit github.com/spf13/cobra github.com/spf13/cobra/doc # github.com/spf13/jwalterweatherman v1.1.0 github.com/spf13/jwalterweatherman # github.com/spf13/pflag v1.0.5 +## explicit github.com/spf13/pflag # github.com/spf13/viper v1.4.0 +## explicit github.com/spf13/viper # github.com/spotinst/spotinst-sdk-go v1.49.0 +## explicit github.com/spotinst/spotinst-sdk-go/service/elastigroup github.com/spotinst/spotinst-sdk-go/service/elastigroup/providers/aws github.com/spotinst/spotinst-sdk-go/service/elastigroup/providers/azure @@ -480,13 +523,17 @@ github.com/spotinst/spotinst-sdk-go/spotinst/util/stringutil github.com/spotinst/spotinst-sdk-go/spotinst/util/uritemplates github.com/spotinst/spotinst-sdk-go/spotinst/util/useragent # github.com/stretchr/testify v1.5.1 +## explicit github.com/stretchr/testify/assert github.com/stretchr/testify/require # github.com/urfave/cli v1.20.0 +## explicit github.com/urfave/cli # github.com/weaveworks/mesh v0.0.0-20170419100114-1f158d31de55 +## explicit github.com/weaveworks/mesh # github.com/zclconf/go-cty v1.3.1 +## explicit github.com/zclconf/go-cty/cty github.com/zclconf/go-cty/cty/convert github.com/zclconf/go-cty/cty/function @@ -516,6 +563,7 @@ go.uber.org/atomic # go.uber.org/multierr v1.1.0 go.uber.org/multierr # go.uber.org/zap v1.10.0 +## explicit go.uber.org/zap go.uber.org/zap/buffer go.uber.org/zap/internal/bufferpool @@ -523,6 +571,7 @@ go.uber.org/zap/internal/color go.uber.org/zap/internal/exit go.uber.org/zap/zapcore # golang.org/x/crypto v0.0.0-20200220183623-bac4c82f6975 +## explicit golang.org/x/crypto/blake2b golang.org/x/crypto/blowfish golang.org/x/crypto/chacha20 @@ -540,9 +589,11 @@ golang.org/x/crypto/ssh golang.org/x/crypto/ssh/internal/bcrypt_pbkdf golang.org/x/crypto/ssh/terminal # golang.org/x/mod v0.3.0 +## explicit golang.org/x/mod/module golang.org/x/mod/semver # golang.org/x/net v0.0.0-20200226121028-0de0cce0169b +## explicit golang.org/x/net/bpf golang.org/x/net/context golang.org/x/net/context/ctxhttp @@ -559,6 +610,7 @@ golang.org/x/net/ipv6 golang.org/x/net/proxy golang.org/x/net/trace # golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 +## explicit golang.org/x/oauth2 golang.org/x/oauth2/google golang.org/x/oauth2/internal @@ -567,6 +619,7 @@ golang.org/x/oauth2/jwt # golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e golang.org/x/sync/errgroup # golang.org/x/sys v0.0.0-20191128015809-6d18c012aee9 +## explicit golang.org/x/sys/cpu golang.org/x/sys/unix golang.org/x/sys/windows @@ -585,6 +638,7 @@ golang.org/x/text/width # golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 golang.org/x/time/rate # golang.org/x/tools v0.0.0-20200626171337-aa94e735be7f +## explicit golang.org/x/tools/cmd/goimports golang.org/x/tools/go/analysis golang.org/x/tools/go/analysis/passes/inspect @@ -617,6 +671,7 @@ golang.org/x/xerrors/internal # gomodules.xyz/jsonpatch/v2 v2.0.1 gomodules.xyz/jsonpatch/v2 # google.golang.org/api v0.22.0 +## explicit google.golang.org/api/compute/v0.alpha google.golang.org/api/compute/v0.beta google.golang.org/api/compute/v1 @@ -689,11 +744,13 @@ google.golang.org/grpc/tap # gopkg.in/fsnotify.v1 v1.4.7 gopkg.in/fsnotify.v1 # gopkg.in/gcfg.v1 v1.2.3 +## explicit gopkg.in/gcfg.v1 gopkg.in/gcfg.v1/scanner gopkg.in/gcfg.v1/token gopkg.in/gcfg.v1/types # gopkg.in/inf.v0 v0.9.1 +## explicit gopkg.in/inf.v0 # gopkg.in/ini.v1 v1.51.0 gopkg.in/ini.v1 @@ -705,10 +762,12 @@ gopkg.in/square/go-jose.v2/jwt # gopkg.in/warnings.v0 v0.1.2 gopkg.in/warnings.v0 # gopkg.in/yaml.v2 v2.2.8 +## explicit gopkg.in/yaml.v2 # gopkg.in/yaml.v3 v3.0.0-20190905181640-827449938966 gopkg.in/yaml.v3 # honnef.co/go/tools v0.0.1-2020.1.4 +## explicit honnef.co/go/tools/arg honnef.co/go/tools/cmd/staticcheck honnef.co/go/tools/code @@ -739,6 +798,7 @@ honnef.co/go/tools/stylecheck honnef.co/go/tools/unused honnef.co/go/tools/version # k8s.io/api v0.18.1 => k8s.io/api v0.18.1 +## explicit k8s.io/api/admission/v1 k8s.io/api/admission/v1beta1 k8s.io/api/admissionregistration/v1 @@ -787,6 +847,7 @@ k8s.io/apiextensions-apiserver/pkg/apis/apiextensions k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1beta1 # k8s.io/apimachinery v0.18.1 => k8s.io/apimachinery v0.18.1 +## explicit k8s.io/apimachinery/pkg/api/equality k8s.io/apimachinery/pkg/api/errors k8s.io/apimachinery/pkg/api/meta @@ -841,6 +902,7 @@ k8s.io/apimachinery/third_party/forked/golang/json k8s.io/apimachinery/third_party/forked/golang/netutil k8s.io/apimachinery/third_party/forked/golang/reflect # k8s.io/cli-runtime v0.18.1 => k8s.io/cli-runtime v0.18.1 +## explicit k8s.io/cli-runtime/pkg/genericclioptions k8s.io/cli-runtime/pkg/kustomize k8s.io/cli-runtime/pkg/kustomize/k8sdeps @@ -854,6 +916,7 @@ k8s.io/cli-runtime/pkg/kustomize/k8sdeps/validator k8s.io/cli-runtime/pkg/printers k8s.io/cli-runtime/pkg/resource # k8s.io/client-go v0.18.1 => k8s.io/client-go v0.18.1 +## explicit k8s.io/client-go/discovery k8s.io/client-go/discovery/cached/disk k8s.io/client-go/discovery/fake @@ -1090,8 +1153,10 @@ k8s.io/cloud-provider/volume k8s.io/cloud-provider/volume/errors k8s.io/cloud-provider/volume/helpers # k8s.io/cloud-provider-openstack v1.17.0 +## explicit k8s.io/cloud-provider-openstack/pkg/util/openstack # k8s.io/component-base v0.18.1 => k8s.io/component-base v0.18.1 +## explicit k8s.io/component-base/metrics k8s.io/component-base/metrics/legacyregistry k8s.io/component-base/metrics/prometheus/restclient @@ -1099,8 +1164,10 @@ k8s.io/component-base/version # k8s.io/csi-translation-lib v0.18.1 => k8s.io/csi-translation-lib v0.18.1 k8s.io/csi-translation-lib/plugins # k8s.io/helm v2.9.0+incompatible +## explicit k8s.io/helm/pkg/strvals # k8s.io/klog v1.0.0 +## explicit k8s.io/klog k8s.io/klog/klogr # k8s.io/kube-openapi v0.0.0-20200121204235-bf4fb3bd569c @@ -1108,6 +1175,7 @@ k8s.io/kube-openapi/pkg/common k8s.io/kube-openapi/pkg/util/proto k8s.io/kube-openapi/pkg/util/proto/validation # k8s.io/kubectl v0.0.0 => k8s.io/kubectl v0.18.1 +## explicit k8s.io/kubectl/pkg/cmd/util k8s.io/kubectl/pkg/cmd/util/editor k8s.io/kubectl/pkg/cmd/util/editor/crlf @@ -1123,9 +1191,11 @@ k8s.io/kubectl/pkg/util/templates k8s.io/kubectl/pkg/util/term k8s.io/kubectl/pkg/validation # k8s.io/legacy-cloud-providers v0.0.0 => k8s.io/legacy-cloud-providers v0.18.1 +## explicit k8s.io/legacy-cloud-providers/aws k8s.io/legacy-cloud-providers/gce # k8s.io/utils v0.0.0-20200324210504-a9aa75ae1b89 +## explicit k8s.io/utils/buffer k8s.io/utils/exec k8s.io/utils/integer @@ -1138,6 +1208,7 @@ k8s.io/utils/path k8s.io/utils/pointer k8s.io/utils/trace # sigs.k8s.io/controller-runtime v0.5.1-0.20200326092940-754026bd8510 +## explicit sigs.k8s.io/controller-runtime sigs.k8s.io/controller-runtime/pkg/builder sigs.k8s.io/controller-runtime/pkg/cache @@ -1174,6 +1245,7 @@ sigs.k8s.io/controller-runtime/pkg/webhook/conversion sigs.k8s.io/controller-runtime/pkg/webhook/internal/certwatcher sigs.k8s.io/controller-runtime/pkg/webhook/internal/metrics # sigs.k8s.io/controller-tools v0.2.8 +## explicit sigs.k8s.io/controller-tools/cmd/controller-gen sigs.k8s.io/controller-tools/pkg/crd sigs.k8s.io/controller-tools/pkg/crd/markers @@ -1214,4 +1286,27 @@ sigs.k8s.io/kustomize/pkg/types # sigs.k8s.io/structured-merge-diff/v3 v3.0.0 sigs.k8s.io/structured-merge-diff/v3/value # sigs.k8s.io/yaml v1.2.0 +## explicit sigs.k8s.io/yaml +# k8s.io/api => k8s.io/api v0.18.1 +# k8s.io/apimachinery => k8s.io/apimachinery v0.18.1 +# k8s.io/client-go => k8s.io/client-go v0.18.1 +# k8s.io/cloud-provider => k8s.io/cloud-provider v0.18.1 +# k8s.io/kubectl => k8s.io/kubectl v0.18.1 +# k8s.io/apiserver => k8s.io/apiserver v0.18.1 +# k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.18.1 +# k8s.io/kube-scheduler => k8s.io/kube-scheduler v0.18.1 +# k8s.io/kube-proxy => k8s.io/kube-proxy v0.18.1 +# k8s.io/cri-api => k8s.io/cri-api v0.18.1 +# k8s.io/csi-translation-lib => k8s.io/csi-translation-lib v0.18.1 +# k8s.io/legacy-cloud-providers => k8s.io/legacy-cloud-providers v0.18.1 +# k8s.io/component-base => k8s.io/component-base v0.18.1 +# k8s.io/cluster-bootstrap => k8s.io/cluster-bootstrap v0.18.1 +# k8s.io/metrics => k8s.io/metrics v0.18.1 +# k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.18.1 +# k8s.io/kube-aggregator => k8s.io/kube-aggregator v0.18.1 +# k8s.io/kubelet => k8s.io/kubelet v0.18.1 +# k8s.io/cli-runtime => k8s.io/cli-runtime v0.18.1 +# k8s.io/kube-controller-manager => k8s.io/kube-controller-manager v0.18.1 +# k8s.io/code-generator => k8s.io/code-generator v0.18.1 +# github.com/gophercloud/gophercloud => github.com/gophercloud/gophercloud v0.9.0