From ee725cb850acb78027725aee9ec112435213039c Mon Sep 17 00:00:00 2001
From: Carolyn Van Slyck <carolyn.vanslyck@microsoft.com>
Date: Wed, 17 Jan 2018 14:00:03 -0600
Subject: [PATCH] Apply manual configurations from glide.yaml

* 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.
---
 Gopkg.lock |  9 +++++----
 Gopkg.toml | 44 +++++++++++++++++++-------------------------
 2 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/Gopkg.lock b/Gopkg.lock
index 64f09808e47..5a3859daccb 100644
--- a/Gopkg.lock
+++ b/Gopkg.lock
@@ -633,6 +633,7 @@
   revision = "53feefa2559fb8dfa8d81baad31be332c97d6c77"
 
 [[projects]]
+  branch = "release-1.8"
   name = "k8s.io/api"
   packages = [
     "admissionregistration/v1alpha1",
@@ -661,9 +662,9 @@
     "storage/v1beta1"
   ]
   revision = "fe29995db37613b9c5b2a647544cf627bfa8d299"
-  version = "kubernetes-1.8.0"
 
 [[projects]]
+  branch = "release-1.8"
   name = "k8s.io/apimachinery"
   packages = [
     "pkg/api/equality",
@@ -726,9 +727,9 @@
     "third_party/forked/golang/reflect"
   ]
   revision = "9d38e20d609d27e00d4ec18f7b9db67105a2bde0"
-  version = "kubernetes-1.8.0-rc.1"
 
 [[projects]]
+  branch = "release-1.8"
   name = "k8s.io/apiserver"
   packages = [
     "pkg/admission",
@@ -805,9 +806,9 @@
     "plugin/pkg/authorizer/webhook"
   ]
   revision = "f9b476d61dbdf6474e3d42cc5e854d0d8b7f759e"
-  version = "kubernetes-1.8.0-rc.1"
 
 [[projects]]
+  branch = "release-5.0"
   name = "k8s.io/client-go"
   packages = [
     "discovery",
@@ -964,6 +965,6 @@
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "291586ee2c7229a5fc570767a0805ece50c681bd446d9461b2e037a869d22731"
+  inputs-digest = "bd6dca33f1c6eea6913fa4f30dd3e3e8120fd487961ac6fa396eab21eae4eeee"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/Gopkg.toml b/Gopkg.toml
index f42e15f4a14..597c27918ca 100644
--- a/Gopkg.toml
+++ b/Gopkg.toml
@@ -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"