From 34ae324fe976ec1f96a0269ed992af660f2e9465 Mon Sep 17 00:00:00 2001 From: Murat Kabilov Date: Wed, 10 May 2017 13:16:49 +0200 Subject: [PATCH] Glide strip vendor --- Makefile | 2 +- glide.lock | 87 +++++++++++++++++++++++++++++++++++++++++++----------- glide.yaml | 34 +++++++++------------ 3 files changed, 84 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index f3ba476e9..002ca33e7 100644 --- a/Makefile +++ b/Makefile @@ -66,4 +66,4 @@ vet: @staticcheck $(PKG) deps: - @glide update + @glide install --strip-vendor diff --git a/glide.lock b/glide.lock index e61dd915f..1bbc18b7d 100644 --- a/glide.lock +++ b/glide.lock @@ -1,5 +1,5 @@ -hash: de07f359cf295197b1663e28cb7a9652c1bb4b9ddca7e70e4e605410b43e4e5f -updated: 2017-04-19T11:22:12.486616201+02:00 +hash: 5f99f20e4693c230cd709102e4bba350f87205bda86b2c6148ac79da05d7ae47 +updated: 2017-05-10T11:51:19.667157509+02:00 imports: - name: cloud.google.com/go version: 3b1ae45394a234c385be014e9a488f2bb6eef821 @@ -9,11 +9,12 @@ imports: - name: github.com/blang/semver version: 31b736133b98f26d5e078ec9eb591666edfd091f - name: github.com/coreos/etcd - version: 20490caaf0dcd96bb4a95e40625559def8ef5b04 + version: 7e6d876385396bf3ea8f1b58ab24b697a3d9f5d8 subpackages: - client - pkg/pathutil - pkg/types + - version - name: github.com/coreos/go-oidc version: 5644a2f50e2d2d5ba0b474bc5bc55fea1925936d subpackages: @@ -22,10 +23,13 @@ imports: - key - oauth2 - oidc -- name: github.com/coreos/pkg - version: 3ac0863d7acf3bc44daf49afef8919af12f704ef +- name: github.com/coreos/go-semver + version: 568e959cd89871e61434c1143528d9162da89ef2 + subpackages: + - semver +- name: github.com/coreos/pkg + version: fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8 subpackages: - - capnslog - health - httputil - timeutil @@ -38,6 +42,10 @@ imports: subpackages: - digest - reference +- name: github.com/docker/spdystream + version: 449fdfce4d962303d702fec724ef0ad181c92528 + subpackages: + - spdy - name: github.com/emicklei/go-restful version: 89ef8af493ab468a45a42bb0d89a06fccdd2fb22 subpackages: @@ -54,16 +62,15 @@ imports: - name: github.com/go-openapi/swag version: 1d0bd113de87027671077d3c71eb3ac5d7dbba72 - name: github.com/gogo/protobuf - version: 909568be09de550ed094403c2bf8a261b5bb730a + version: 100ba4e885062801d56799d78530b73b178a78f3 subpackages: - proto - sortkeys - name: github.com/golang/glog version: 44145f04b68cf362d9c4df2182967c2275eaefed - name: github.com/golang/protobuf - version: 4bd1920723d7b7c925de087aa32e2187708897f7 + version: 8616e8ee5e20a1704615e6c8d7afcdac06087a67 subpackages: - - jsonpb - proto - name: github.com/google/gofuzz version: bbcb9da2d746f8bdbd6a936686a0a6067ada0ec5 @@ -72,7 +79,7 @@ imports: - name: github.com/imdario/mergo version: 6633656539c1639d9d78127b7d47c622b5d7b6dc - name: github.com/jonboulle/clockwork - version: 2eee05ed794112d45db504eb05aa693efd2b8b09 + version: 72f9bd7c4e0c2a40055ab3d0f09654f730cce982 - name: github.com/juju/ratelimit version: 77ed1c8a01217656d2080ad51981f6e99adaa177 - name: github.com/kr/text @@ -98,28 +105,24 @@ imports: - name: github.com/Sirupsen/logrus version: ba1b36c82c5e05c4f912a88eab0dcd91a171688f - name: github.com/spf13/pflag - version: 08b1a584251b5b62f458943640fc8ebd4d50aaa5 + version: 5ccb023bc27df288a957c5e994cd44fd19619465 - name: github.com/ugorji/go - version: ded73eae5db7e7a0ef6f55aace87a2873c5d2b74 + version: f1f1a805ed361a0e078bb537e4ea78cd37dcf065 subpackages: - codec - name: golang.org/x/crypto - version: 1351f936d976c60a0a48d728281922cf63eafb8d + version: 1f22c0103821b9390939b6776727195525381532 subpackages: - - bcrypt - - blowfish - ssh/terminal - name: golang.org/x/net - version: f2499483f923065a842d38eb4c7f1927e6fc6e6d + version: e90d6d0afc4c315a0d87a568ae68577cc15149a0 subpackages: - context - context/ctxhttp - http2 - http2/hpack - idna - - internal/timeseries - lex/httplex - - trace - name: golang.org/x/oauth2 version: 3c3a985cb79f52a3190fbc056984415ca6763d01 subpackages: @@ -160,6 +163,48 @@ imports: version: 3887ee99ecf07df5b447e9b00d9c0b2adaa9f3e4 - name: gopkg.in/yaml.v2 version: 53feefa2559fb8dfa8d81baad31be332c97d6c77 +- name: k8s.io/apimachinery + version: 84c15da65eb86243c295d566203d7689cc6ac04b + subpackages: + - 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/fields + - pkg/labels + - pkg/openapi + - pkg/runtime + - pkg/runtime/schema + - pkg/runtime/serializer + - pkg/runtime/serializer/json + - pkg/runtime/serializer/protobuf + - pkg/runtime/serializer/recognizer + - pkg/runtime/serializer/versioning + - pkg/selection + - pkg/types + - pkg/util/errors + - pkg/util/framer + - pkg/util/httpstream + - pkg/util/httpstream/spdy + - pkg/util/intstr + - pkg/util/json + - pkg/util/net + - pkg/util/remotecommand + - pkg/util/runtime + - pkg/util/sets + - pkg/util/validation + - pkg/util/validation/field + - pkg/util/wait + - pkg/util/yaml + - pkg/watch + - third_party/forked/golang/netutil + - third_party/forked/golang/reflect - name: k8s.io/client-go version: e121606b0d09b2e1c467183ee46217fa85a6b672 subpackages: @@ -275,4 +320,10 @@ imports: - tools/clientcmd/api/v1 - tools/metrics - transport +- name: k8s.io/kubernetes + version: ee39d359dd0896c4c0eccf23f033f158ad3d3bd7 + subpackages: + - pkg/api + - pkg/client/unversioned/remotecommand + - pkg/util/exec testImports: [] diff --git a/glide.yaml b/glide.yaml index 33f976605..c366f1e5d 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,30 +1,24 @@ package: github.bus.zalan.do/acid/postgres-operator import: +- package: github.com/gogo/protobuf + version: ^0.3.0 - package: github.com/Sirupsen/logrus - version: ^0.11.2 + version: ^0.11.5 - package: github.com/coreos/etcd - version: ^3.1.0 + version: ^3.1.7 subpackages: - client - package: github.com/lib/pq +- package: github.com/motomux/pretty +- package: golang.org/x/net + subpackages: + - context +- package: k8s.io/apimachinery + subpackages: + - pkg/util/json - package: k8s.io/client-go version: ^2.0.0 +- package: k8s.io/kubernetes + version: ^1.6.2 subpackages: - - kubernetes - - pkg/api - - pkg/api/errors - - pkg/api/meta - - pkg/api/resource - - pkg/api/unversioned - - pkg/api/v1 - - pkg/apis/apps/v1beta1 - - pkg/apis/extensions/v1beta1 - - pkg/fields - - pkg/labels - - pkg/runtime - - pkg/runtime/serializer - - pkg/util/intstr - - rest - - tools/cache - - tools/clientcmd -- package: github.com/motomux/pretty + - pkg/client/unversioned/remotecommand