Handle dependencies better

This commit is contained in:
Arthur Barr
2017-09-28 13:21:03 +01:00
parent 22706a5a5c
commit ba390173ec
3 changed files with 14 additions and 16 deletions

View File

@@ -50,8 +50,8 @@ downloads: downloads/mqadv_dev903_ubuntu_x86-64.tar.gz
.PHONY: deps
deps:
glide install --strip-vendor
cd test/docker && dep ensure
cd test/kubernetes && dep ensure
cd test/docker && dep ensure -vendor-only
cd test/kubernetes && dep ensure -vendor-only
build/runmqserver:
mkdir -p build

View File

@@ -200,10 +200,10 @@
revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
[[projects]]
branch = "master"
branch = "release-1.7"
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/apis/meta/v1alpha1","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/clock","pkg/util/diff","pkg/util/errors","pkg/util/framer","pkg/util/intstr","pkg/util/json","pkg/util/net","pkg/util/rand","pkg/util/runtime","pkg/util/sets","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/reflect"]
revision = "b166f81f5c4c88402ae23a0d0944c6ad08bffd3b"
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/apis/meta/v1alpha1","pkg/conversion","pkg/conversion/queryparams","pkg/conversion/unstructured","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/streaming","pkg/runtime/serializer/versioning","pkg/selection","pkg/types","pkg/util/clock","pkg/util/diff","pkg/util/errors","pkg/util/framer","pkg/util/intstr","pkg/util/json","pkg/util/net","pkg/util/rand","pkg/util/runtime","pkg/util/sets","pkg/util/validation","pkg/util/validation/field","pkg/util/wait","pkg/util/yaml","pkg/version","pkg/watch","third_party/forked/golang/reflect"]
revision = "8ab5f3d8a330c2e9baaf84e39042db8d49034ae2"
[[projects]]
name = "k8s.io/client-go"
@@ -211,15 +211,9 @@
revision = "d92e8497f71b7b4e0494e5bd204b48d34bd6f254"
version = "v4.0.0"
[[projects]]
branch = "master"
name = "k8s.io/kube-openapi"
packages = ["pkg/common"]
revision = "abfc5fbe1cf87ee697db107fdfd24c32fe4397a8"
[solve-meta]
analyzer-name = "dep"
analyzer-version = 1
inputs-digest = "05d4500518bb3fde554ca53f3d165ed3a20dec25bd4a24c6e59ee50dbea491b9"
inputs-digest = "caae962961e20347a5f6f9001a55d7baa94307f6bf6aecc001165a28a51e3919"
solver-name = "gps-cdcl"
solver-version = 1

View File

@@ -16,10 +16,14 @@
branch = "master"
name = "golang.org/x/sys"
[[constraint]]
branch = "master"
name = "k8s.io/apimachinery"
# The version of client-go corresponds to a specific Kubernetes version
# (e.g. client-go 4.0.0 is for kubernetes 1.7)
# If you change this version, you also need to update the corresponding
# branch for k8s.io/apimachinery (below)
[[constraint]]
name = "k8s.io/client-go"
version = "4.0.0"
[[constraint]]
name = "k8s.io/apimachinery"
branch = "release-1.7"