From 49e12e961fa2942eb29d83728454645ba845c53e Mon Sep 17 00:00:00 2001 From: Lukianov Artyom Date: Tue, 17 Oct 2017 18:18:34 +0300 Subject: [PATCH] Move our code from glide to dep Signed-off-by: Lukianov Artyom --- .gitignore | 2 +- .travis.yml | 2 +- Gopkg.lock | 288 ++++++++++++++++++++++++ Gopkg.toml | 96 ++++++++ Makefile | 19 +- automation/test.sh | 2 +- docs/getting-started.md | 9 +- glide.lock | 472 ---------------------------------------- glide.yaml | 208 ------------------ 9 files changed, 397 insertions(+), 701 deletions(-) create mode 100644 Gopkg.lock create mode 100644 Gopkg.toml delete mode 100644 glide.lock delete mode 100644 glide.yaml diff --git a/.gitignore b/.gitignore index c914677c1886..ed2ad5c520a6 100644 --- a/.gitignore +++ b/.gitignore @@ -19,5 +19,5 @@ cluster/.console.vv build-tools/desc/desc hack/config-local.sh tags -.glide.* +.Gopkg.* .GeneratedDockerfile diff --git a/.travis.yml b/.travis.yml index eb50ad67799d..4468cfd0d3bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,7 +18,7 @@ before_install: install: - git reset --hard # we are caching the vendor folder, make sure we see the new vendor.json file - go get github.com/mattn/goveralls - - go get -u github.com/Masterminds/glide + - go get -u github.com/golang/dep/cmd/dep - go get golang.org/x/tools/cmd/goimports - go get -u github.com/golang/mock/gomock - go get -u github.com/rmohr/mock/mockgen diff --git a/Gopkg.lock b/Gopkg.lock new file mode 100644 index 000000000000..6850f9eb266d --- /dev/null +++ b/Gopkg.lock @@ -0,0 +1,288 @@ +# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. + + +[[projects]] + name = "github.com/PuerkitoBio/purell" + packages = ["."] + revision = "8a290539e2e8629dbc4e6bad948158f790ec31f4" + version = "v1.0.0" + +[[projects]] + name = "github.com/PuerkitoBio/urlesc" + packages = ["."] + revision = "5bd2802263f21d8788851d5305584c82a5c75d7e" + +[[projects]] + branch = "master" + name = "github.com/asaskevich/govalidator" + packages = ["."] + revision = "ca5f9e638c83bac66bfac70ded5bded1503135a7" + +[[projects]] + name = "github.com/davecgh/go-spew" + packages = ["spew"] + revision = "782f4967f2dc4564575ca782fe2d04090b5faca8" + +[[projects]] + branch = "master" + name = "github.com/emicklei/go-restful" + packages = [".","log"] + revision = "dc0f94ee75de39d6420e5446b0222490264bb90f" + +[[projects]] + branch = "master" + name = "github.com/emicklei/go-restful-openapi" + packages = ["."] + revision = "0d037b269a5b53b582789e25dee0d0a0614119e5" + +[[projects]] + name = "github.com/emicklei/go-restful-swagger12" + packages = ["."] + revision = "dcef7f55730566d41eae5db10e7d6981829720f6" + version = "1.0.1" + +[[projects]] + name = "github.com/evanphx/json-patch" + packages = ["."] + revision = "ba18e35c5c1b36ef6334cad706eb681153d2d379" + +[[projects]] + name = "github.com/fsnotify/fsnotify" + packages = ["."] + revision = "629574ca2a5df945712d3079857300b5e4da0236" + version = "v1.4.2" + +[[projects]] + name = "github.com/ghodss/yaml" + packages = ["."] + revision = "73d445a93680fa1a78ae23a5839bad48f32ba1ee" + +[[projects]] + name = "github.com/go-kit/kit" + packages = ["endpoint","log","transport/http"] + revision = "fe6fe28ba0d54b39f27e79cddba4911b7e4fffc7" + +[[projects]] + name = "github.com/go-logfmt/logfmt" + packages = ["."] + revision = "390ab7935ee28ec6b286364bba9b4dd6410cb3d5" + version = "v0.3.0" + +[[projects]] + branch = "master" + name = "github.com/go-openapi/jsonpointer" + packages = ["."] + revision = "779f45308c19820f1a69e9a4cd965f496e0da10f" + +[[projects]] + branch = "master" + name = "github.com/go-openapi/jsonreference" + packages = ["."] + revision = "36d33bfe519efae5632669801b180bf1a245da3b" + +[[projects]] + branch = "master" + name = "github.com/go-openapi/spec" + packages = ["."] + revision = "48c2a7185575f9103a5a3863eff950bb776899d2" + +[[projects]] + branch = "master" + name = "github.com/go-openapi/swag" + packages = ["."] + revision = "f3f9494671f93fcff853e3c6e9e948b3eb71e590" + +[[projects]] + name = "github.com/go-stack/stack" + packages = ["."] + revision = "817915b46b97fd7bb80e8ab6b69f01a53ac3eebf" + version = "v1.6.0" + +[[projects]] + branch = "master" + name = "github.com/gogo/protobuf" + packages = ["proto","sortkeys"] + revision = "0c5dcd73e6fd1ac6c452a68ec7f8d463d111be66" + +[[projects]] + branch = "master" + name = "github.com/golang/glog" + packages = ["."] + revision = "23def4e6c14b4da8ac2ed8007337bc5eb5007998" + +[[projects]] + name = "github.com/golang/groupcache" + packages = ["lru"] + revision = "02826c3e79038b59d737d3b1c0a1d937f71a4433" + +[[projects]] + branch = "master" + name = "github.com/golang/mock" + packages = ["gomock"] + revision = "6e20fef50e74e443696bc32b693cf286b612d45b" + +[[projects]] + name = "github.com/golang/protobuf" + packages = ["proto","ptypes","ptypes/any","ptypes/duration","ptypes/timestamp"] + revision = "4bd1920723d7b7c925de087aa32e2187708897f7" + +[[projects]] + branch = "master" + name = "github.com/google/gofuzz" + packages = ["."] + revision = "24818f796faf91cd76ec7bddd72458fbced7a6c1" + +[[projects]] + name = "github.com/googleapis/gnostic" + packages = ["OpenAPIv2","compiler","extensions"] + revision = "0c5108395e2debce0d731cf0287ddf7242066aba" + +[[projects]] + branch = "master" + name = "github.com/gorilla/websocket" + packages = ["."] + revision = "71fa72d4842364bc5f74185f4161e0099ea3624a" + +[[projects]] + name = "github.com/hashicorp/golang-lru" + packages = [".","simplelru"] + revision = "a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4" + +[[projects]] + branch = "master" + name = "github.com/howeyc/gopass" + packages = ["."] + revision = "bf9dde6d0d2c004a008c27aaee91170c786f6db8" + +[[projects]] + name = "github.com/imdario/mergo" + packages = ["."] + revision = "6633656539c1639d9d78127b7d47c622b5d7b6dc" + +[[projects]] + name = "github.com/jeevatkm/go-model" + packages = ["."] + revision = "00bcf69e10573c4ba261c9842194d07e6d4b50e9" + version = "v1.0" + +[[projects]] + branch = "master" + name = "github.com/juju/ratelimit" + packages = ["."] + revision = "5b9ff866471762aa2ab2dced63c9fb6f53921342" + +[[projects]] + branch = "master" + name = "github.com/kr/logfmt" + packages = ["."] + revision = "b84e30acd515aadc4b783ad4ff83aff3299bdfe0" + +[[projects]] + name = "github.com/libvirt/libvirt-go" + packages = ["."] + revision = "7b2a44de9fd207c2cbc28bdbad20c8279b767553" + version = "v3.8.0" + +[[projects]] + name = "github.com/mailru/easyjson" + packages = ["buffer","jlexer","jwriter"] + revision = "2a92e673c9a6302dd05c3a691ae1f24aef46457d" + +[[projects]] + branch = "master" + name = "github.com/onsi/ginkgo" + packages = [".","config","extensions/table","internal/codelocation","internal/containernode","internal/failer","internal/leafnodes","internal/remote","internal/spec","internal/spec_iterator","internal/specrunner","internal/suite","internal/testingtproxy","internal/writer","reporters","reporters/stenographer","reporters/stenographer/support/go-colorable","reporters/stenographer/support/go-isatty","types"] + revision = "11459a886d9cd66b319dac7ef1e917ee221372c9" + +[[projects]] + name = "github.com/onsi/gomega" + packages = [".","format","ghttp","internal/assertion","internal/asyncassertion","internal/oraclematcher","internal/testingtsupport","matchers","matchers/support/goraph/bipartitegraph","matchers/support/goraph/edge","matchers/support/goraph/node","matchers/support/goraph/util","types"] + revision = "dcabb60a477c2b6f456df65037cb6708210fbb02" + +[[projects]] + name = "github.com/pborman/uuid" + packages = ["."] + revision = "e790cca94e6cc75c7064b1332e63811d4aae1a53" + version = "v1.1" + +[[projects]] + name = "github.com/satori/go.uuid" + packages = ["."] + revision = "879c5887cd475cd7864858769793b2ceb0d44feb" + version = "v1.1.0" + +[[projects]] + branch = "master" + name = "github.com/spf13/pflag" + packages = ["."] + revision = "1f33b80956cde38911d1f23d764deb8d77a649ce" + +[[projects]] + name = "github.com/ugorji/go" + packages = ["codec"] + revision = "ded73eae5db7e7a0ef6f55aace87a2873c5d2b74" + +[[projects]] + name = "golang.org/x/crypto" + packages = ["ssh/terminal"] + revision = "d172538b2cfce0c13cee31e647d0367aa8cd2486" + +[[projects]] + name = "golang.org/x/net" + packages = ["context","context/ctxhttp","html","html/atom","html/charset","http2","http2/hpack","idna","lex/httplex"] + revision = "1c05540f6879653db88113bc4a2b70aec4bd491f" + +[[projects]] + name = "golang.org/x/sys" + packages = ["unix"] + revision = "7a4fde3fda8ef580a89dbae8138c26041be14299" + +[[projects]] + name = "golang.org/x/text" + packages = ["cases","encoding","encoding/charmap","encoding/htmlindex","encoding/internal","encoding/internal/identifier","encoding/japanese","encoding/korean","encoding/simplifiedchinese","encoding/traditionalchinese","encoding/unicode","internal","internal/gen","internal/tag","internal/triegen","internal/ucd","internal/utf8internal","language","runes","secure/bidirule","secure/precis","transform","unicode/bidi","unicode/cldr","unicode/norm","unicode/rangetable","width"] + revision = "b19bf474d317b857955b12035d2c5acb57ce8b01" + +[[projects]] + name = "gopkg.in/inf.v0" + packages = ["."] + revision = "3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4" + version = "v0.9.0" + +[[projects]] + name = "gopkg.in/ini.v1" + packages = ["."] + revision = "5b3e00af70a9484542169a976dcab8d03e601a17" + version = "v1.30.0" + +[[projects]] + name = "gopkg.in/yaml.v2" + packages = ["."] + revision = "53feefa2559fb8dfa8d81baad31be332c97d6c77" + +[[projects]] + name = "k8s.io/api" + packages = ["admissionregistration/v1alpha1","apps/v1beta1","apps/v1beta2","authentication/v1","authentication/v1beta1","authorization/v1","authorization/v1beta1","autoscaling/v1","autoscaling/v2alpha1","batch/v1","batch/v1beta1","batch/v2alpha1","certificates/v1beta1","core/v1","extensions/v1beta1","networking/v1","policy/v1beta1","rbac/v1","rbac/v1alpha1","rbac/v1beta1","scheduling/v1alpha1","settings/v1alpha1","storage/v1","storage/v1beta1"] + revision = "f30e293246921de7f4ee46bb65b8762b2f890fc4" + +[[projects]] + name = "k8s.io/apimachinery" + packages = ["pkg/api/equality","pkg/api/errors","pkg/api/meta","pkg/api/resource","pkg/apimachinery","pkg/apimachinery/announced","pkg/apimachinery/registered","pkg/apis/meta/v1","pkg/apis/meta/v1/unstructured","pkg/conversion","pkg/conversion/queryparams","pkg/conversion/unstructured","pkg/fields","pkg/labels","pkg/runtime","pkg/runtime/schema","pkg/runtime/serializer","pkg/runtime/serializer/json","pkg/runtime/serializer/protobuf","pkg/runtime/serializer/recognizer","pkg/runtime/serializer/streaming","pkg/runtime/serializer/versioning","pkg/selection","pkg/types","pkg/util/cache","pkg/util/clock","pkg/util/diff","pkg/util/errors","pkg/util/framer","pkg/util/intstr","pkg/util/json","pkg/util/mergepatch","pkg/util/net","pkg/util/rand","pkg/util/runtime","pkg/util/sets","pkg/util/strategicpatch","pkg/util/uuid","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/json","third_party/forked/golang/reflect"] + revision = "31421d9f8c2d6073628a89b4654fe22aced33167" + +[[projects]] + name = "k8s.io/client-go" + packages = ["discovery","discovery/fake","kubernetes","kubernetes/fake","kubernetes/scheme","kubernetes/typed/admissionregistration/v1alpha1","kubernetes/typed/admissionregistration/v1alpha1/fake","kubernetes/typed/apps/v1beta1","kubernetes/typed/apps/v1beta1/fake","kubernetes/typed/apps/v1beta2","kubernetes/typed/apps/v1beta2/fake","kubernetes/typed/authentication/v1","kubernetes/typed/authentication/v1/fake","kubernetes/typed/authentication/v1beta1","kubernetes/typed/authentication/v1beta1/fake","kubernetes/typed/authorization/v1","kubernetes/typed/authorization/v1/fake","kubernetes/typed/authorization/v1beta1","kubernetes/typed/authorization/v1beta1/fake","kubernetes/typed/autoscaling/v1","kubernetes/typed/autoscaling/v1/fake","kubernetes/typed/autoscaling/v2alpha1","kubernetes/typed/autoscaling/v2alpha1/fake","kubernetes/typed/batch/v1","kubernetes/typed/batch/v1/fake","kubernetes/typed/batch/v1beta1","kubernetes/typed/batch/v1beta1/fake","kubernetes/typed/batch/v2alpha1","kubernetes/typed/batch/v2alpha1/fake","kubernetes/typed/certificates/v1beta1","kubernetes/typed/certificates/v1beta1/fake","kubernetes/typed/core/v1","kubernetes/typed/core/v1/fake","kubernetes/typed/extensions/v1beta1","kubernetes/typed/extensions/v1beta1/fake","kubernetes/typed/networking/v1","kubernetes/typed/networking/v1/fake","kubernetes/typed/policy/v1beta1","kubernetes/typed/policy/v1beta1/fake","kubernetes/typed/rbac/v1","kubernetes/typed/rbac/v1/fake","kubernetes/typed/rbac/v1alpha1","kubernetes/typed/rbac/v1alpha1/fake","kubernetes/typed/rbac/v1beta1","kubernetes/typed/rbac/v1beta1/fake","kubernetes/typed/scheduling/v1alpha1","kubernetes/typed/scheduling/v1alpha1/fake","kubernetes/typed/settings/v1alpha1","kubernetes/typed/settings/v1alpha1/fake","kubernetes/typed/storage/v1","kubernetes/typed/storage/v1/fake","kubernetes/typed/storage/v1beta1","kubernetes/typed/storage/v1beta1/fake","pkg/version","rest","rest/watch","testing","tools/auth","tools/cache","tools/cache/testing","tools/clientcmd","tools/clientcmd/api","tools/clientcmd/api/latest","tools/clientcmd/api/v1","tools/metrics","tools/record","tools/reference","transport","util/cert","util/flowcontrol","util/homedir","util/integer","util/workqueue"] + revision = "db8228460e2de17f5d3a9a453f61dde0ba86545a" + +[[projects]] + branch = "master" + name = "k8s.io/kube-openapi" + packages = ["pkg/common"] + revision = "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8" + +[solve-meta] + analyzer-name = "dep" + analyzer-version = 1 + inputs-digest = "84828a80dc032069659dc4c9cfdc4289afae07799f9e918517d47aa95292b4ef" + solver-name = "gps-cdcl" + solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml new file mode 100644 index 000000000000..4630ce29d912 --- /dev/null +++ b/Gopkg.toml @@ -0,0 +1,96 @@ + +# Gopkg.toml example +# +# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md +# for detailed Gopkg.toml documentation. +# +# required = ["github.com/user/thing/cmd/thing"] +# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"] +# +# [[constraint]] +# name = "github.com/user/project" +# version = "1.0.0" +# +# [[constraint]] +# name = "github.com/user/project2" +# branch = "dev" +# source = "github.com/myfork/project2" +# +# [[override]] +# name = "github.com/x/y" +# version = "2.4.0" + +ignored = ["code.google.com/p/go-charset","github.com/go-kit/kit/examples","github.com/go-kit/kit/log/levels","github.com/go-kit/kit/metrics/influxdb","github.com/go-kit/kit/service","github.com/googleapis/gnostic/plugins","k8s.io/apimachinery/pkg/apis/meta/v1alpha1"] + +[[constraint]] + name = "github.com/asaskevich/govalidator" + +[[constraint]] + name = "github.com/emicklei/go-restful" + +[[constraint]] + name = "github.com/emicklei/go-restful-openapi" + +[[constraint]] + name = "github.com/evanphx/json-patch" + +[[constraint]] + name = "github.com/fsnotify/fsnotify" + version = "1.4.2" + +[[constraint]] + name = "github.com/ghodss/yaml" + +[[constraint]] + name = "github.com/go-kit/kit" + +[[constraint]] + name = "github.com/go-openapi/spec" + +[[constraint]] + name = "github.com/golang/glog" + +[[constraint]] + name = "github.com/golang/mock" + +[[constraint]] + name = "github.com/gorilla/websocket" + +[[constraint]] + name = "github.com/jeevatkm/go-model" + +[[constraint]] + name = "github.com/libvirt/libvirt-go" + +[[constraint]] + name = "github.com/onsi/ginkgo" + +[[constraint]] + name = "github.com/onsi/gomega" + +[[constraint]] + name = "github.com/satori/go.uuid" + +[[constraint]] + name = "github.com/spf13/pflag" + +[[constraint]] + name = "golang.org/x/crypto" + +[[constraint]] + name = "golang.org/x/net" + +[[constraint]] + name = "gopkg.in/ini.v1" + +[[constraint]] + name = "gopkg.in/yaml.v2" + +[[constraint]] + name = "k8s.io/api" + +[[constraint]] + name = "k8s.io/apimachinery" + +[[constraint]] + name = "k8s.io/client-go" diff --git a/Makefile b/Makefile index a434c8b62fbb..cb7968060dec 100644 --- a/Makefile +++ b/Makefile @@ -34,23 +34,20 @@ clean: distclean: clean rm -rf vendor/ rm -f manifest/*.yaml - rm -f .glide.*.hash - glide cc + rm -f .Gopkg.*.hash checksync: - test -f .glide.yaml.hash || ${HASH} glide.yaml > .glide.yaml.hash - if [ "`${HASH} glide.yaml`" != "`cat .glide.yaml.hash`" ]; then \ - glide cc; \ - glide update --strip-vendor; \ - ${HASH} glide.yaml > .glide.yaml.hash; \ - ${HASH} glide.lock > .glide.lock.hash; \ - elif [ "`${HASH} glide.lock`" != "`cat .glide.lock.hash`" ]; then \ + if [ ! -e .Gopkg.toml.hash ] || [ "`${HASH} Gopkg.toml`" != "`cat .Gopkg.toml.hash`" ]; then \ + dep ensure; \ + ${HASH} Gopkg.toml > .Gopkg.toml.hash; \ + ${HASH} Gopkg.lock > .Gopkg.lock.hash; \ + elif [ ! -e .Gopkg.lock.hash ] || [ "`${HASH} Gopkg.lock`" != "`cat .Gopkg.lock.hash`" ]; then \ make sync; \ fi sync: - glide install --strip-vendor - ${HASH} glide.lock > .glide.lock.hash + dep ensure -vendor-only + ${HASH} Gopkg.lock > .Gopkg.lock.hash; docker: build ./hack/build-docker.sh build ${WHAT} diff --git a/automation/test.sh b/automation/test.sh index dbe0940eadc8..62d12d47addf 100644 --- a/automation/test.sh +++ b/automation/test.sh @@ -61,7 +61,7 @@ set -e # Build kubevirt go get golang.org/x/tools/cmd/goimports -go get -u github.com/Masterminds/glide +go get -u github.com/golang/dep/cmd/dep make # Copy connection details for kubernetes diff --git a/docs/getting-started.md b/docs/getting-started.md index 96efeb3b2395..35209670e85e 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -70,15 +70,10 @@ to install a few build requirements: cd $GOPATH # Use goimports for package import ordering go get golang.org/x/tools/cmd/goimports - # Setup glide which is used to track dependencies - go get github.com/Masterminds/glide + # Setup dep which is used to track dependencies + go get -u github.com/golang/dep/cmd/dep ``` -**Note:** Make sure you're using the glide version from your $GOPATH. If you -have a version installed via your system's package manager, it's likely older -and might not be able to work with k8s.io/client-go. -[Github Issue](https://github.com/Masterminds/glide/issues/615) - ### Sources Now we can clone the project into your `$GOPATH`: diff --git a/glide.lock b/glide.lock deleted file mode 100644 index fddb90b55302..000000000000 --- a/glide.lock +++ /dev/null @@ -1,472 +0,0 @@ -hash: b5dd69192737ed1e89a6ac07b50ebbf76f67f1330b84b7d3500e6f09d1c670cb -updated: 2017-10-16T15:49:47.265313161+02:00 -imports: -- name: github.com/asaskevich/govalidator - version: ca5f9e638c83bac66bfac70ded5bded1503135a7 -- name: github.com/davecgh/go-spew - version: 782f4967f2dc4564575ca782fe2d04090b5faca8 - subpackages: - - spew -- name: github.com/emicklei/go-restful - version: dc0f94ee75de39d6420e5446b0222490264bb90f - subpackages: - - log -- name: github.com/emicklei/go-restful-openapi - version: 0d037b269a5b53b582789e25dee0d0a0614119e5 -- name: github.com/emicklei/go-restful-swagger12 - version: dcef7f55730566d41eae5db10e7d6981829720f6 -- name: github.com/evanphx/json-patch - version: ba18e35c5c1b36ef6334cad706eb681153d2d379 -- name: github.com/fsnotify/fsnotify - version: 629574ca2a5df945712d3079857300b5e4da0236 -- name: github.com/ghodss/yaml - version: 73d445a93680fa1a78ae23a5839bad48f32ba1ee -- name: github.com/go-kit/kit - version: fe6fe28ba0d54b39f27e79cddba4911b7e4fffc7 - subpackages: - - endpoint - - log - - transport/http -- name: github.com/go-logfmt/logfmt - version: 390ab7935ee28ec6b286364bba9b4dd6410cb3d5 -- name: github.com/go-openapi/jsonpointer - version: 779f45308c19820f1a69e9a4cd965f496e0da10f -- name: github.com/go-openapi/jsonreference - version: 36d33bfe519efae5632669801b180bf1a245da3b -- name: github.com/go-openapi/spec - version: 48c2a7185575f9103a5a3863eff950bb776899d2 -- name: github.com/go-openapi/swag - version: f3f9494671f93fcff853e3c6e9e948b3eb71e590 -- name: github.com/go-stack/stack - version: 817915b46b97fd7bb80e8ab6b69f01a53ac3eebf -- name: github.com/gogo/protobuf - version: c0656edd0d9eab7c66d1eb0c568f9039345796f7 - subpackages: - - proto - - sortkeys -- name: github.com/golang/glog - version: 23def4e6c14b4da8ac2ed8007337bc5eb5007998 -- name: github.com/golang/groupcache - version: 02826c3e79038b59d737d3b1c0a1d937f71a4433 - subpackages: - - lru -- name: github.com/golang/mock - version: 6e20fef50e74e443696bc32b693cf286b612d45b - subpackages: - - gomock -- name: github.com/golang/protobuf - version: 4bd1920723d7b7c925de087aa32e2187708897f7 - subpackages: - - proto - - ptypes - - ptypes/any - - ptypes/duration - - ptypes/timestamp -- name: github.com/google/gofuzz - version: 24818f796faf91cd76ec7bddd72458fbced7a6c1 -- name: github.com/googleapis/gnostic - version: 0c5108395e2debce0d731cf0287ddf7242066aba - subpackages: - - OpenAPIv2 - - compiler - - extensions -- name: github.com/gorilla/websocket - version: 71fa72d4842364bc5f74185f4161e0099ea3624a -- name: github.com/hashicorp/golang-lru - version: a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4 - subpackages: - - simplelru -- name: github.com/howeyc/gopass - version: bf9dde6d0d2c004a008c27aaee91170c786f6db8 -- name: github.com/imdario/mergo - version: 6633656539c1639d9d78127b7d47c622b5d7b6dc -- name: github.com/jeevatkm/go-model - version: 00bcf69e10573c4ba261c9842194d07e6d4b50e9 -- name: github.com/juju/ratelimit - version: 5b9ff866471762aa2ab2dced63c9fb6f53921342 -- name: github.com/kr/logfmt - version: b84e30acd515aadc4b783ad4ff83aff3299bdfe0 -- name: github.com/libvirt/libvirt-go - version: 7b2a44de9fd207c2cbc28bdbad20c8279b767553 -- name: github.com/mailru/easyjson - version: 2a92e673c9a6302dd05c3a691ae1f24aef46457d - subpackages: - - buffer - - jlexer - - jwriter -- name: github.com/onsi/ginkgo - version: 11459a886d9cd66b319dac7ef1e917ee221372c9 - subpackages: - - config - - extensions/table - - internal/codelocation - - internal/containernode - - internal/failer - - internal/leafnodes - - internal/remote - - internal/spec - - internal/spec_iterator - - internal/specrunner - - internal/suite - - internal/testingtproxy - - internal/writer - - reporters - - reporters/stenographer - - reporters/stenographer/support/go-colorable - - reporters/stenographer/support/go-isatty - - types -- name: github.com/onsi/gomega - version: dcabb60a477c2b6f456df65037cb6708210fbb02 - subpackages: - - format - - ghttp - - internal/assertion - - internal/asyncassertion - - internal/oraclematcher - - internal/testingtsupport - - matchers - - matchers/support/goraph/bipartitegraph - - matchers/support/goraph/edge - - matchers/support/goraph/node - - matchers/support/goraph/util - - types -- name: github.com/pborman/uuid - version: e790cca94e6cc75c7064b1332e63811d4aae1a53 -- name: github.com/PuerkitoBio/purell - version: 8a290539e2e8629dbc4e6bad948158f790ec31f4 -- name: github.com/PuerkitoBio/urlesc - version: 5bd2802263f21d8788851d5305584c82a5c75d7e -- name: github.com/satori/go.uuid - version: 5bf94b69c6b68ee1b541973bb8e1144db23a194b -- name: github.com/spf13/pflag - version: a9789e855c7696159b7db0db7f440b449edf2b31 -- name: github.com/ugorji/go - version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 - subpackages: - - codec -- name: golang.org/x/crypto - version: d172538b2cfce0c13cee31e647d0367aa8cd2486 - subpackages: - - ssh/terminal -- name: golang.org/x/net - version: 1c05540f6879653db88113bc4a2b70aec4bd491f - subpackages: - - context - - context/ctxhttp - - html - - html/atom - - html/charset - - http2 - - http2/hpack - - idna - - lex/httplex -- name: golang.org/x/sys - version: 7a4fde3fda8ef580a89dbae8138c26041be14299 - subpackages: - - unix -- name: golang.org/x/text - version: b19bf474d317b857955b12035d2c5acb57ce8b01 - subpackages: - - cases - - encoding - - encoding/charmap - - encoding/htmlindex - - encoding/internal - - encoding/internal/identifier - - encoding/japanese - - encoding/korean - - encoding/simplifiedchinese - - encoding/traditionalchinese - - encoding/unicode - - internal - - internal/tag - - internal/utf8internal - - language - - runes - - secure/bidirule - - secure/precis - - transform - - unicode/bidi - - unicode/norm - - width -- name: gopkg.in/inf.v0 - version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 -- name: gopkg.in/ini.v1 - version: 5b3e00af70a9484542169a976dcab8d03e601a17 -- name: gopkg.in/yaml.v2 - version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 -- name: k8s.io/api - version: f30e293246921de7f4ee46bb65b8762b2f890fc4 - subpackages: - - admissionregistration/v1alpha1 - - apps/v1beta1 - - apps/v1beta2 - - authentication/v1 - - authentication/v1beta1 - - authorization/v1 - - authorization/v1beta1 - - autoscaling/v1 - - autoscaling/v2alpha1 - - batch/v1 - - batch/v1beta1 - - batch/v2alpha1 - - certificates/v1beta1 - - core/v1 - - extensions/v1beta1 - - networking/v1 - - policy/v1beta1 - - rbac/v1 - - rbac/v1alpha1 - - rbac/v1beta1 - - scheduling/v1alpha1 - - settings/v1alpha1 - - storage/v1 - - storage/v1beta1 -- name: k8s.io/apimachinery - version: 31421d9f8c2d6073628a89b4654fe22aced33167 - subpackages: - - pkg/api/equality - - pkg/api/errors - - pkg/api/meta - - pkg/api/resource - - pkg/apimachinery - - pkg/apimachinery/announced - - pkg/apimachinery/registered - - pkg/apis/meta/v1 - - pkg/apis/meta/v1/unstructured - - pkg/conversion - - pkg/conversion/queryparams - - pkg/conversion/unstructured - - pkg/fields - - pkg/labels - - pkg/runtime - - pkg/runtime/schema - - pkg/runtime/serializer - - pkg/runtime/serializer/json - - pkg/runtime/serializer/protobuf - - pkg/runtime/serializer/recognizer - - pkg/runtime/serializer/streaming - - pkg/runtime/serializer/versioning - - pkg/selection - - pkg/types - - pkg/util/cache - - pkg/util/clock - - pkg/util/diff - - pkg/util/errors - - pkg/util/framer - - pkg/util/intstr - - pkg/util/json - - pkg/util/mergepatch - - pkg/util/net - - pkg/util/rand - - pkg/util/runtime - - pkg/util/sets - - pkg/util/strategicpatch - - pkg/util/uuid - - pkg/util/validation - - pkg/util/validation/field - - pkg/util/wait - - pkg/util/yaml - - pkg/version - - pkg/watch - - third_party/forked/golang/json - - third_party/forked/golang/reflect -- name: k8s.io/client-go - version: db8228460e2de17f5d3a9a453f61dde0ba86545a - subpackages: - - discovery - - discovery/fake - - examples/third-party-resources-deprecated/apis/tpr/v1 - - examples/third-party-resources-deprecated/client - - examples/third-party-resources-deprecated/controller - - informers/admissionregistration - - informers/admissionregistration/v1alpha1 - - informers/apps - - informers/apps/v1beta1 - - informers/autoscaling - - informers/autoscaling/v1 - - informers/autoscaling/v2alpha1 - - informers/batch - - informers/batch/v1 - - informers/batch/v2alpha1 - - informers/certificates - - informers/certificates/v1beta1 - - informers/core - - informers/core/v1 - - informers/extensions - - informers/extensions/v1beta1 - - informers/internalinterfaces - - informers/networking - - informers/networking/v1 - - informers/policy - - informers/policy/v1beta1 - - informers/rbac - - informers/rbac/v1alpha1 - - informers/rbac/v1beta1 - - informers/settings - - informers/settings/v1alpha1 - - informers/storage - - informers/storage/v1 - - informers/storage/v1beta1 - - kubernetes - - kubernetes/fake - - kubernetes/scheme - - kubernetes/typed/admissionregistration/v1alpha1 - - kubernetes/typed/admissionregistration/v1alpha1/fake - - kubernetes/typed/apps/v1beta1 - - kubernetes/typed/apps/v1beta1/fake - - kubernetes/typed/apps/v1beta2 - - kubernetes/typed/apps/v1beta2/fake - - kubernetes/typed/authentication/v1 - - kubernetes/typed/authentication/v1/fake - - kubernetes/typed/authentication/v1beta1 - - kubernetes/typed/authentication/v1beta1/fake - - kubernetes/typed/authorization/v1 - - kubernetes/typed/authorization/v1/fake - - kubernetes/typed/authorization/v1beta1 - - kubernetes/typed/authorization/v1beta1/fake - - kubernetes/typed/autoscaling/v1 - - kubernetes/typed/autoscaling/v1/fake - - kubernetes/typed/autoscaling/v2alpha1 - - kubernetes/typed/autoscaling/v2alpha1/fake - - kubernetes/typed/batch/v1 - - kubernetes/typed/batch/v1/fake - - kubernetes/typed/batch/v1beta1 - - kubernetes/typed/batch/v1beta1/fake - - kubernetes/typed/batch/v2alpha1 - - kubernetes/typed/batch/v2alpha1/fake - - kubernetes/typed/certificates/v1beta1 - - kubernetes/typed/certificates/v1beta1/fake - - kubernetes/typed/core/v1 - - kubernetes/typed/core/v1/fake - - kubernetes/typed/extensions/v1beta1 - - kubernetes/typed/extensions/v1beta1/fake - - kubernetes/typed/networking/v1 - - kubernetes/typed/networking/v1/fake - - kubernetes/typed/policy/v1beta1 - - kubernetes/typed/policy/v1beta1/fake - - kubernetes/typed/rbac/v1 - - kubernetes/typed/rbac/v1/fake - - kubernetes/typed/rbac/v1alpha1 - - kubernetes/typed/rbac/v1alpha1/fake - - kubernetes/typed/rbac/v1beta1 - - kubernetes/typed/rbac/v1beta1/fake - - kubernetes/typed/scheduling/v1alpha1 - - kubernetes/typed/scheduling/v1alpha1/fake - - kubernetes/typed/settings/v1alpha1 - - kubernetes/typed/settings/v1alpha1/fake - - kubernetes/typed/storage/v1 - - kubernetes/typed/storage/v1/fake - - kubernetes/typed/storage/v1beta1 - - kubernetes/typed/storage/v1beta1/fake - - listers/admissionregistration/v1alpha1 - - listers/apps/v1beta1 - - listers/autoscaling/v1 - - listers/autoscaling/v2alpha1 - - listers/batch/v1 - - listers/batch/v2alpha1 - - listers/certificates/v1beta1 - - listers/core/v1 - - listers/extensions/v1beta1 - - listers/networking/v1 - - listers/policy/v1beta1 - - listers/rbac/v1alpha1 - - listers/rbac/v1beta1 - - listers/settings/v1alpha1 - - listers/storage/v1 - - listers/storage/v1beta1 - - pkg/api - - pkg/api/install - - pkg/api/v1 - - pkg/api/v1/ref - - pkg/apis/apps - - pkg/apis/apps/install - - pkg/apis/apps/v1beta1 - - pkg/apis/authentication - - pkg/apis/authentication/install - - pkg/apis/authentication/v1 - - pkg/apis/authentication/v1beta1 - - pkg/apis/authorization - - pkg/apis/authorization/install - - pkg/apis/authorization/v1 - - pkg/apis/authorization/v1beta1 - - pkg/apis/autoscaling - - pkg/apis/autoscaling/install - - pkg/apis/autoscaling/v1 - - pkg/apis/autoscaling/v2alpha1 - - pkg/apis/batch - - pkg/apis/batch/install - - pkg/apis/batch/v1 - - pkg/apis/batch/v2alpha1 - - pkg/apis/certificates - - pkg/apis/certificates/install - - pkg/apis/certificates/v1beta1 - - pkg/apis/extensions - - pkg/apis/extensions/install - - pkg/apis/extensions/v1beta1 - - pkg/apis/policy - - pkg/apis/policy/install - - pkg/apis/policy/v1beta1 - - pkg/apis/rbac - - pkg/apis/rbac/install - - pkg/apis/rbac/v1alpha1 - - pkg/apis/rbac/v1beta1 - - pkg/apis/settings - - pkg/apis/settings/install - - pkg/apis/settings/v1alpha1 - - pkg/apis/storage - - pkg/apis/storage/install - - pkg/apis/storage/v1 - - pkg/apis/storage/v1beta1 - - pkg/util - - pkg/util/parsers - - pkg/version - - plugin/pkg/client/auth/azure - - plugin/pkg/client/auth/gcp - - plugin/pkg/client/auth/oidc - - rest - - rest/watch - - testing - - third_party/forked/golang/template - - tools/auth - - tools/cache - - tools/cache/testing - - tools/clientcmd - - tools/clientcmd/api - - tools/clientcmd/api/latest - - tools/clientcmd/api/v1 - - tools/metrics - - tools/record - - tools/reference - - transport - - util/cert - - util/clock - - util/exec - - util/flowcontrol - - util/homedir - - util/integer - - util/jsonpath - - util/workqueue -- name: k8s.io/kube-openapi - version: abfc5fbe1cf87ee697db107fdfd24c32fe4397a8 - subpackages: - - pkg/common -testImports: -- name: github.com/elazarl/goproxy - version: 07b16b6e30fcac0ad8c0435548e743bcf2ca7e92 -- name: github.com/facebookgo/structtag - version: 217e25fb96916cc60332e399c9aa63f5c422ceed -- name: github.com/smartystreets/goconvey - version: e5b2b7c9111590d019a696c7800593f666e1a7f4 - subpackages: - - convey -- name: github.com/stretchr/testify - version: e3a8ff8ce36581f87a15341206f205b1da467059 - subpackages: - - assert -- name: golang.org/x/sync - version: 8e0aa688b654ef28caa72506fa5ec8dba9fc7690 - subpackages: - - errgroup -- name: gopkg.in/check.v1 - version: 64131543e7896d5bcc6bd5a76287eb75ea96c673 diff --git a/glide.yaml b/glide.yaml deleted file mode 100644 index b266e6ce0e14..000000000000 --- a/glide.yaml +++ /dev/null @@ -1,208 +0,0 @@ -package: kubevirt.io/kubevirt -ignore: -- github.com/go-kit/kit/examples -- github.com/googleapis/gnostic/plugins -- github.com/go-kit/kit/log/levels -- github.com/go-kit/kit/metrics/influxdb -- github.com/go-kit/kit/service -- k8s.io/apimachinery/pkg/apis/meta/v1alpha1 -- code.google.com/p/go-charset -import: -- package: github.com/go-kit/kit - version: fe6fe28ba0d54b39f27e79cddba4911b7e4fffc7 - subpackages: - - log -- package: github.com/emicklei/go-restful - version: dc0f94ee75de39d6420e5446b0222490264bb90f - subpackages: - - log -- package: github.com/evanphx/json-patch - version: ba18e35c5c1b36ef6334cad706eb681153d2d379 -- package: k8s.io/client-go - version: db8228460e2de17f5d3a9a453f61dde0ba86545a - subpackages: - - discovery - - discovery/fake - - examples/third-party-resources-deprecated/apis/tpr/v1 - - examples/third-party-resources-deprecated/client - - examples/third-party-resources-deprecated/controller - - informers/admissionregistration - - informers/admissionregistration/v1alpha1 - - informers/apps - - informers/apps/v1beta1 - - informers/autoscaling - - informers/autoscaling/v1 - - informers/autoscaling/v2alpha1 - - informers/batch - - informers/batch/v1 - - informers/batch/v2alpha1 - - informers/certificates - - informers/certificates/v1beta1 - - informers/core - - informers/core/v1 - - informers/extensions - - informers/extensions/v1beta1 - - informers/internalinterfaces - - informers/networking - - informers/networking/v1 - - informers/policy - - informers/policy/v1beta1 - - informers/rbac - - informers/rbac/v1alpha1 - - informers/rbac/v1beta1 - - informers/settings - - informers/settings/v1alpha1 - - informers/storage - - informers/storage/v1 - - informers/storage/v1beta1 - - kubernetes - - kubernetes/scheme - - kubernetes/typed/admissionregistration/v1alpha1 - - kubernetes/typed/admissionregistration/v1alpha1/fake - - kubernetes/typed/apps/v1beta1 - - kubernetes/typed/apps/v1beta1/fake - - kubernetes/typed/authentication/v1 - - kubernetes/typed/authentication/v1/fake - - kubernetes/typed/authentication/v1beta1 - - kubernetes/typed/authentication/v1beta1/fake - - kubernetes/typed/authorization/v1 - - kubernetes/typed/authorization/v1/fake - - kubernetes/typed/authorization/v1beta1 - - kubernetes/typed/authorization/v1beta1/fake - - kubernetes/typed/autoscaling/v1 - - kubernetes/typed/autoscaling/v1/fake - - kubernetes/typed/autoscaling/v2alpha1 - - kubernetes/typed/autoscaling/v2alpha1/fake - - kubernetes/typed/batch/v1 - - kubernetes/typed/batch/v1/fake - - kubernetes/typed/batch/v2alpha1 - - kubernetes/typed/batch/v2alpha1/fake - - kubernetes/typed/certificates/v1beta1 - - kubernetes/typed/certificates/v1beta1/fake - - kubernetes/typed/core/v1 - - kubernetes/typed/core/v1/fake - - kubernetes/typed/extensions/v1beta1 - - kubernetes/typed/extensions/v1beta1/fake - - kubernetes/typed/networking/v1 - - kubernetes/typed/networking/v1/fake - - kubernetes/typed/policy/v1beta1 - - kubernetes/typed/policy/v1beta1/fake - - kubernetes/typed/rbac/v1alpha1 - - kubernetes/typed/rbac/v1alpha1/fake - - kubernetes/typed/rbac/v1beta1 - - kubernetes/typed/rbac/v1beta1/fake - - kubernetes/typed/settings/v1alpha1 - - kubernetes/typed/settings/v1alpha1/fake - - kubernetes/typed/storage/v1 - - kubernetes/typed/storage/v1/fake - - kubernetes/typed/storage/v1beta1 - - kubernetes/typed/storage/v1beta1/fake - - listers/admissionregistration/v1alpha1 - - listers/apps/v1beta1 - - listers/autoscaling/v1 - - listers/autoscaling/v2alpha1 - - listers/batch/v1 - - listers/batch/v2alpha1 - - listers/certificates/v1beta1 - - listers/core/v1 - - listers/extensions/v1beta1 - - listers/networking/v1 - - listers/policy/v1beta1 - - listers/rbac/v1alpha1 - - listers/rbac/v1beta1 - - listers/settings/v1alpha1 - - listers/storage/v1 - - listers/storage/v1beta1 - - pkg/api - - pkg/api/install - - pkg/api/v1 - - pkg/api/v1/ref - - pkg/apis/apps - - pkg/apis/apps/install - - pkg/apis/apps/v1beta1 - - pkg/apis/authentication - - pkg/apis/authentication/install - - pkg/apis/authentication/v1 - - pkg/apis/authentication/v1beta1 - - pkg/apis/authorization - - pkg/apis/authorization/install - - pkg/apis/authorization/v1 - - pkg/apis/authorization/v1beta1 - - pkg/apis/autoscaling - - pkg/apis/autoscaling/install - - pkg/apis/autoscaling/v1 - - pkg/apis/autoscaling/v2alpha1 - - pkg/apis/batch - - pkg/apis/batch/install - - pkg/apis/batch/v1 - - pkg/apis/batch/v2alpha1 - - pkg/apis/certificates - - pkg/apis/certificates/install - - pkg/apis/certificates/v1beta1 - - pkg/apis/extensions - - pkg/apis/extensions/install - - pkg/apis/extensions/v1beta1 - - pkg/apis/policy - - pkg/apis/policy/install - - pkg/apis/policy/v1beta1 - - pkg/apis/rbac - - pkg/apis/rbac/install - - pkg/apis/rbac/v1alpha1 - - pkg/apis/rbac/v1beta1 - - pkg/apis/settings - - pkg/apis/settings/install - - pkg/apis/settings/v1alpha1 - - pkg/apis/storage - - pkg/apis/storage/install - - pkg/apis/storage/v1 - - pkg/apis/storage/v1beta1 - - pkg/util - - pkg/util/parsers - - pkg/version - - plugin/pkg/client/auth/azure - - plugin/pkg/client/auth/gcp - - plugin/pkg/client/auth/oidc - - rest - - rest/watch - - testing - - third_party/forked/golang/template - - tools/auth - - tools/cache - - tools/clientcmd - - tools/clientcmd/api - - tools/clientcmd/api/latest - - tools/clientcmd/api/v1 - - tools/metrics - - tools/record - - transport - - util/cert - - util/clock - - util/exec - - util/flowcontrol - - util/homedir - - util/integer - - util/jsonpath - - util/workqueue -- package: github.com/fsnotify/fsnotify - version: ^1.4.2 -- package: github.com/mailru/easyjson - version: 2a92e673c9a6302dd05c3a691ae1f24aef46457d -- package: github.com/emicklei/go-restful-openapi -- package: github.com/go-openapi/spec -- package: github.com/emicklei/go-restful-swagger12 -testImport: -- package: github.com/elazarl/goproxy - version: 07b16b6e30fcac0ad8c0435548e743bcf2ca7e92 -- package: github.com/facebookgo/structtag -- package: github.com/smartystreets/goconvey - subpackages: - - convey -- package: github.com/stretchr/testify - version: e3a8ff8ce36581f87a15341206f205b1da467059 - subpackages: - - assert -- package: golang.org/x/sync - subpackages: - - errgroup -- package: gopkg.in/check.v1 - version: 64131543e7896d5bcc6bd5a76287eb75ea96c673