Skip to content
This repository has been archived by the owner on May 6, 2022. It is now read-only.

Commit

Permalink
Apply manual configurations from glide.yaml
Browse files Browse the repository at this point in the history
* Add back ignored pinned constraints. dep init doesn't import pinned
constraints but in some cases we really did need to pin because a good
version wasn't available.

* Some of the constraints were set to exact versions insted of the
release branches, because the revision was the same, so I'm resetting
them back to the release branch.
  • Loading branch information
carolynvs-msft committed Jan 17, 2018
1 parent 21fc4a3 commit ee725cb
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 29 deletions.
9 changes: 5 additions & 4 deletions Gopkg.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 19 additions & 25 deletions Gopkg.toml
Original file line number Diff line number Diff line change
@@ -1,37 +1,31 @@
# 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"


[[constraint]]
name = "github.com/coreos/etcd"
version = "3.2.9"

[[constraint]]
name = "k8s.io/api"
version = "kubernetes-1.8.0"
branch = "release-1.8"

[[constraint]]
name = "k8s.io/apimachinery"
version = "kubernetes-1.8.0-rc.1"
branch = "release-1.8"

[[constraint]]
name = "k8s.io/apiserver"
version = "kubernetes-1.8.0-rc.1"
branch = "release-1.8"

[[constraint]]
name = "k8s.io/client-go"
branch = "release-5.0"

# We want Nov 4, 2014 version as the Jul 24, 2015 version (latest version)
# introduces bug documented in issue 1187
[[constraint]]
name = "github.com/golang/glog"
revision = "44145f04b68cf362d9c4df2182967c2275eaefed"

# k8s.io 1.8 (Oct 4, 2017)
# TODO(carolynvs) - Must consumers of service catalog as a library use this exact version? If not, let's remove this and rely on our lock
[[constraint]]
name = "k8s.io/kube-openapi"
revision = "868f2f29720b192240e18284659231b440f9cda5"

0 comments on commit ee725cb

Please sign in to comment.